3.4.0

New features and fixes

.gitignore

@@ -1,7 +1,7 @@
 .vs/
 .vscode/
 .git/
-/CloudAPIPowerShellManagement.Log
+/*.Log
-/CloudAPIPowerShellManagement.Lo_
+/*.Lo_
-/Documentation/Get-LanguageStrings.ps1
+/*.csv
 

ADMXImport.md

@@ -0,0 +1,214 @@
+# ADMX Ingestion
+
+The script can create Custom Profiles based on ADMX ingestion. ADMX ingestion is a way to support existing ADMX files in an MDM environment. Windows uses the [Policy CSP](https://docs.microsoft.com/en-us/windows/client-management/mdm/policy-configuration-service-provider) to apply the configuration. 
+
+Microsoft links:
+
+* ADMX Ingestion documentation can be found [here](https://docs.microsoft.com/en-us/windows/client-management/mdm/understanding-admx-backed-policies) and [here](https://docs.microsoft.com/en-us/windows/client-management/mdm/enable-admx-backed-policies-in-mdm)
+* Additional information including blocked registry keys can be found [here](https://docs.microsoft.com/en-us/windows/client-management/mdm/win32-and-centennial-app-policy-configuration)  
+* Shema definition documentation can be found [here](https://docs.microsoft.com/en-us/openspecs/windows_protocols/ms-gpreg/6e10478a-e9e6-4fdc-a1f6-bdd9bd7f2209)
+* Old ADMX schema documentation (Vista) including attribute information can be found [here](http://download.microsoft.com/download/5/0/8/5081217f-4a2a-470e-a7fa-5976e40b0839/Group%20Policy%20ADMX%20Syntax%20Reference%20Guide.doc)
+* Another schema documentation including attribute information can be found [here](https://docs.microsoft.com/en-us/previous-versions/windows/desktop/policy/admx-schema)
+
+## ADMX Import
+
+The **ADMX Import** tool is used for configuring 3rd party applications e.g. Chrome, Google Update etc., These ADMX files are available from the software vendor. An ADMX can be loaded in the tool and all settings can be configured using a similar UI as GPMC. When the ADMX is loaded, the script will look for an ADML file that is either in the same directory or in the en-US subdirectory. An ADML file can also be loaded manually, if another language should be used in the UI.
+
+<img src="https://raw.githubusercontent.com/Micke-K/IntuneManagement/master/ADMXExample.png" height="50%" width="50%"/>
+
+The image above shows the the tool after the chrome.admx file was loaded. The tool supports delivering ADMX settings to HKLM (Computer Settings) and HKCU (User Settings). Categories will be added based on the Class attribute for each ADMX policy setting. The *All settings* category will display all the settings for the base category (Computer or User)
+
+<img src="https://raw.githubusercontent.com/Micke-K/IntuneManagement/master/ADMXSettingExample.png" height="50%" width="50%"/>
+
+A policy setting can either be edited via double-clicking an item or right-clicking and select Edit. 
+
+The *Intune OMA-URI name* property specifies the name of the OMA-URI row in the Custom Profile. This is optional and if it is not specified, the script will use the name of the policy.
+
+A policy must be set to Enabled before any changes can be made. The *Policy* tab will list all possible settings for the policy. This could be a dropdown box, text box, check box, numeric up-down box etc. The script creates the controls based on the presentation settings in the ADML file. An ADML is not mandatory but the controls and the UI could cause unpredictive results. Always use the associated ADML for correctly generated controls.
+
+<img src="https://raw.githubusercontent.com/Micke-K/IntuneManagement/master/ADMXSettingExampleOMAURI.png" height="50%" width="50%"/>
+
+The *OMA-URI Settings* tab contains the configured settings. This is the string that will be added to the enabled policy. This can be manually configure in case there is something that is not supported by the script. Do **NOT** add <enabled /> or <disabled /> to this text box. The script will add that automatically.  If *Manual configuration* is checked, the script will upload the text as it is specified, including additional manual changes. If it is not checked, the script will generate the text when importing the profile. If manual configuration is added and then checkbox is cleared, those changes will be lost during the upload.
+
+The *XML Definition* tab contains the XML node for the ADMX policy. This is used for reference in case manual configuration is required.
+
+<img src="https://raw.githubusercontent.com/Micke-K/IntuneManagement/master/ADMXImportSetting.png" height="50%" width="50%"/>
+
+The *Import* tab  is used for creating the Custom Profile in Intune. The *Custom Profile Name* is mandatory and specifies the name of the profile.  
+
+The *ADMX Policy File Name* is mandatory and this should be a globally unique name. This will generate an ADMX file on the client. See the Deep Dive section for more information.
+
+The *ADMX App Id* is mandatory and this does not have to be unique but it is recommended in some circumstances e.g. if multiple versions of the Chrome ADMX file is uploaded, it is recommended to add the version to the *ADMX Policy File Name* and *ADMX App Id* e.g. Chrome91. See the Deep Dive section for more information.
+
+The *Ingest ADMX file* is checked by default and this will included the ADMX file ingestion in the Custom Profile. If there will be multiple Custom Profiles based on the same ADMX file, it might be better to have one Custom Profile for the ADMX ingestion and one separate Custom Profile for each of the settings. This requires that the same *ADMX App Id* is used for each Custom Profile that is based in the ingested ADMX file. 
+
+ The *OMA-URI Name  for the ADMX ingestion* specifies the name of the OMA-URI row inside the Custom Profile. This is optional. It will be set to a value based on the loaded file name by default e.g. chrome.admx Ingestion.
+
+The *Import* button will create the Custom Profile in Intune. There is no visual information if the profile was created successfully but the log will display the name and id of the created profile. A message box will be displayed if it fails to create the Custom Profile. 
+
+## Reg Values
+
+The **Reg Values** tool can be used to create registry values in HKLM and HKCU. This uses the same functionality as the ADMX Import tool; ADMX ingestion. The difference is that the Reg Values tool builds the ADMX file in the background based on the added registry values. There are some benefits of using this over a PowerShell script e.g. Intune will state if the registry keys were applied successfully and if a conflict or an error occurred.  
+
+<img src="https://raw.githubusercontent.com/Micke-K/IntuneManagement/master/ADMXRegValuePolicy.png" height="50%" width="50%"/>
+
+The initial screen include the options of specifying the Custom Profile name and description. The *Policy type* can either be Policy or Preferences. See Known Issues and Limitations for more information about policy types.
+
+The *Added reg values* list contains the ADMX policies. Each ADMX policy can contain one or more registry values.
+
+The top part of the *Add new reg policy* form specifies the attributes on the policy node in the ADMX file. The *Policy name* identifies the policy. This cannot contain any spaces. The *Policy status* property specifies if the policy should be enabled or disabled. The hive and the key properties specifies where the registry values should be added. The *Reg key* property is a global value for all added registry values in the bottom section.
+
+The *Policy value* is an optional value. This should only be used if the registry policy should add a value that specifies if it is enabled/disable e.g. 1 or 0. This will use the enabledValue and disabledValue nodes in the background. If this value is specified, a registry value (DWORD) will be set to 1 when the policy is enabled or 0 if the policy is disabled.
+
+The lower part of the form specifies individual registry values. The tool support creating/setting the following type of registry values:
+
+* String
+* Expanded string (String with Expanded checked)
+* Multi-string
+* DWORD
+* List - a key/value string list. Each key will be a string value.
+
+The *Key* property is not required unless the value is located in a different location than specified in the *Reg key* property. This is used when specifying values for the List type. The List type values will then be added to a separate key.
+
+**Note:** The List type does not support specifying the value name since all values are creating in a separate key.
+
+*Value name* and *Value* properties specifies the values that should be created in the registry. 
+
+Modify existing values by double-clicking on the value in the *Added reg values* list.
+
+The *Additional value settings* section has additional settings for a policy type. This can be used to create a REG_EXPAND_SZ instead of a REG_SZ etc.
+
+**Note:** The *Do not overwrite value* will set the soft attribute. This does **NOT** work, at least not outside the Software\Policies area on a cloud only joined device. This property is kept until more testing can confirm that it doesn't work at all.
+
+Example of setting registry values for a device and a user: 
+
+<img src="https://raw.githubusercontent.com/Micke-K/IntuneManagement/master/RegPolicyHKCU.png" height="50%" width="50%"/>
+
+Example of adding HKCU settings
+
+<img src="https://raw.githubusercontent.com/Micke-K/IntuneManagement/master/RegPolicyHKLM.png" height="50%" width="50%"/>
+
+Example of adding HKLM settings
+
+<img src="https://raw.githubusercontent.com/Micke-K/IntuneManagement/master/RegADMXFileContent.png" height="50%" width="50%"/>
+
+Example of generated ADMX file
+
+<img src="https://raw.githubusercontent.com/Micke-K/IntuneManagement/master/RegValueIntuneProfile.png" height="50%" width="50%"/>
+
+Example of the created Custom Profile created. 
+
+<img src="https://raw.githubusercontent.com/Micke-K/IntuneManagement/master/RegProfileADMXIngestion.png" height="50%" width="50%"/>
+
+Example of the OMA-URI row for ADMX ingestion for a custom registry value.
+
+<img src="https://raw.githubusercontent.com/Micke-K/IntuneManagement/master/RegProfileOMAURISetting.png" height="50%" width="50%"/>
+
+Example of the OMA-URI row for specifying the registry values to set.
+
+<img src="https://raw.githubusercontent.com/Micke-K/IntuneManagement/master/RegValuesHKCU.png" height="50%" width="50%"/>
+
+Example of the implemented HKCU settings for a user
+
+<img src="https://raw.githubusercontent.com/Micke-K/IntuneManagement/master/RegValuesHKLM.png" height="50%" width="50%"/>
+
+Example of the implemented HKLM settings for a device
+
+<img src="https://raw.githubusercontent.com/Micke-K/IntuneManagement/master/RegValuesHKLMList.png" height="50%" width="50%"/>
+
+Example of the List type implementation on a device 
+
+## Deep Dive
+
+The [Policy CSP](https://docs.microsoft.com/en-us/windows/client-management/mdm/policy-configuration-service-provider) is used when ingesting ADMX files. When a Custom Profile with ADMX ingestion is assigned to a device, the Policy CSP will add information about the ADMX file in the registry and create an ADMX file in the file system.
+
+**ADMX ingestion:**
+
+An ADMX is ingested by using the following OMA-URI path:
+
+./device/Vendor/MSFT/Policy/ConfigOperations/ADMXInstall/<AppID>/[Policy|Preference]/<ADMXFileName>
+
+Example:
+
+./device/Vendor/MSFT/Policy/ConfigOperations/ADMXInstall/Chrome/Policy/ChromeAdmx
+
+This will generate an ADMX file, ChromeAdmx.admx, in the following folder on the device:
+
+%ProgramData%\Microsoft\PolicyManager\ADMXIngestion\\<ProviderGuid>\\<AppID>\\[Policy|Preference]
+
+The Reg Values tool will always use IntuneManagementReg as AppId. Each uploaded reg policy will have a unique named ADMX file, RegPolicy_<GUID>. 
+
+The Policy CSP will create multiple registry values under HKLM\Software\Microsoft\PolicyManager
+
+The ADMXDefault part will contain each Category, with full path, specified in the ADMX file. This is why the AppID must be unique when using multiple versions of the same admx file since each of these files will have the same category IDs e.g. each Chrome version should be named based on the version like Chromev91.
+
+<img src="https://raw.githubusercontent.com/Micke-K/IntuneManagement/master/RegADMXDefault.png" height="50%" width="50%"/>
+
+**Note:** If the same ADMX filename is used, the first file saved will win. It looks like Intune will not overwrite an existing ADMX file. That is why a unique name must be specified when different versions of the ADMX file is used.
+
+There is an additional registry key added for the ADMX ingestion. Each ingested file will generate a key under AdmxInstalled.
+
+AdmxInstalled\<ProviderGuid>\\<AppID>\\[Policy|Preference]\\<ADMXFileName>
+
+Example:
+
+\SOFTWARE\Microsoft\PolicyManager\AdmxInstalled\D12FCE57-F71E-4D0D-93EE-35C5E6F8C0D9\Chrome\Policy\ChromeAdmx
+
+This key contains information when it was added, status and how many policies it has.
+
+**Policy Settings**
+
+Each setting is added based on the following OMA-URI path:
+
+./[User|Device]/vendor/msft/policy/config/<AppID>~[Policy|Preference]~<CategoryPath>/<PolicyName>
+
+Example:
+
+./Device/Vendor/MSFT/Policy/Config/Chrome~Policy~googlechrome~Startup/ShowHomeButton
+
+The CategoryPath is the full path to the category where the setting is defined. Each categoryId is separated with a ~. This should match the registry value specified in the image above in the ADMXDefault key. 
+
+One registry key for each ADMX policy is created under the Provider path (PolicyManager\Provider\\<GUID>) . This includes the OME-URI settings configured in the Custom Profile. 
+
+<img src="https://raw.githubusercontent.com/Micke-K/IntuneManagement/master/RegADMXProvider.png" height="50%" width="50%"/>
+
+Applied settings are added to the Current registry key, Current\Device or Current\\<SID> depending if it is for the device or the user. There is one key for each policy category.
+
+<img src="https://raw.githubusercontent.com/Micke-K/IntuneManagement/master/RegADMXCurrent.png" height="50%" width="50%"/>
+
+**Troubleshooting**
+
+The Event Viewer can be used for troubleshooting any issues with ADMX ingestion. The events are added to the following log:
+
+Application and Services log\Microsoft\Windows\DeviceManagement-Enterprise-Diagnostics-Provider\Admin
+
+The following events can be used for troubleshooting:
+
+* 819 - Information: The policy settings was successfully deleted 
+* 831 - Information: The policy settings was successfully added 
+* 866 - Information: Update policy (This is followed after a 872 or 873 event)
+* 872 - Information: Start updating existing ADMX ingestion
+* 873 - Information: Starting new ADMX ingestion
+* 865 - Error  Catastrophic Failure. This could be that the ADMX is invalid. 
+* 404 - Error: This is generated for different reason
+  * Generated after a 865 Catastrophic Failure error
+  * The system cannot find the file. The CSP cannot file the specified ADMX file. This could happen when ADMX and policies are in separate Custom Profiles and the wrong AppID was specified in the OMA+URI paths or if the policy settings are applied before the ADMX ingestion.
+* 454 - Error: This is listed when the Custom Profile is removed and the CSP cannot delete registry values outside Software\Policies.  
+
+## Known Issues and Limitations
+
+* The created ADMX ingestion profiles has only been tested on cloud only joined devices.  
+* According to [this](https://docs.microsoft.com/en-us/windows/client-management/mdm/win32-and-centennial-app-policy-configuration) link, policies will NOT be enforced unless the device is domain joined. So only Hybrid devices would support enforced values. This means that all settings on cloud only joined devices will be set as Preference values e.g. set once and never updated.
+
+**ADMX Import:**
+
+* Only categories and policy names specified in the loaded ADMX/ADML file will be translated. If the ADMX uses strings outside the loaded ADML file, it might be blank or using the string id.  
+
+**Reg Values**
+
+* The Preferences type is supported by the tool but tests shows that there is no difference in functionality compared to the Policy type on cloud only joined devices.  
+* The script will block some registry keys. These keys are blocked by Microsoft and a PowerShell script is required to write to these values. See [this](https://docs.microsoft.com/en-us/windows/client-management/mdm/win32-and-centennial-app-policy-configuration) link for more information.
+* Values outside Software\Policies will **NOT** be deleted when the policy is removed.
+* The tool supports all ADMX attributes specified in the schema but it looks like some functionalities are not supported by Windows or the Policy CSP e.g. the *soft* attribute should be set to true to avoid overwriting an existing value but all values were overwritten during the tests, even if the soft attribute was set. 
+* QWORD is not supported. The ADMX schema definition includes longDecimal which would create QWORD values but this is not supported in the Policy CSP. It will generate a Catastrophic Failure event in the Event Log. 
+* No support for enabledList/disabledList. This might be added in the future since this could make it very easy to create mapped drives via ADMX ingestion. 

CloudAPIPowerShellManagement.psm1

@@ -69,7 +69,23 @@ function Initialize-CloudAPIManagement
         [string]
         $View = "",
         [switch]
-        $ShowConsoleWindow
+        $ShowConsoleWindow,
+        [switch]
+        $JSonSettings,
+        [string]
+        $JSonFile,
+        [switch]
+        $Silent,
+        [string]
+        $SilentBatchFile,
+        [string]
+        $tenantId,
+        [string]
+        $appId,
+        [string]
+        $secret,
+        [string]
+        $certificate
     )
 
     $global:wpfNS = "xmlns='http://schemas.microsoft.com/winfx/2006/xaml/presentation' xmlns:x='http://schemas.microsoft.com/winfx/2006/xaml'"
@@ -77,21 +93,43 @@ function Initialize-CloudAPIManagement
     [void] [System.Reflection.Assembly]::LoadWithPartialName("System.Windows.Forms") 
     Add-Type -AssemblyName PresentationFramework
 
-    try 
+    $global:hideUI = ($Silent -eq $true)
+    $global:SilentBatchFile = $SilentBatchFile
+
+    if($global:hideUI -ne $true)
     {        
-        [xml]$xaml = Get-Content ([IO.Path]::GetDirectoryName($PSCommandPath) + "\Xaml\SplashScreen.xaml")
+        # Run with UI
-        $global:SplashScreen = ([Windows.Markup.XamlReader]::Load((New-Object System.Xml.XmlNodeReader $xaml)))
+        try 
-        $global:txtSplashTitle = $global:SplashScreen.FindName("txtSplashTitle")
+        {
-        $global:txtSplashText = $global:SplashScreen.FindName("txtSplashText")
+            [xml]$xaml = Get-Content ([IO.Path]::GetDirectoryName($PSCommandPath) + "\Xaml\SplashScreen.xaml")
+            $global:SplashScreen = ([Windows.Markup.XamlReader]::Load((New-Object System.Xml.XmlNodeReader $xaml)))
+            $global:txtSplashTitle = $global:SplashScreen.FindName("txtSplashTitle")
+            $global:txtSplashText = $global:SplashScreen.FindName("txtSplashText")
 
-        $global:txtSplashTitle.Text = ("Initializing Cloud API PowerShell Management")
+            $global:txtSplashTitle.Text = ("Initializing Cloud API PowerShell Management")
 
-        $global:SplashScreen.Show() | Out-Null
+            $global:SplashScreen.Show() | Out-Null
-        [System.Windows.Forms.Application]::DoEvents()
+            [System.Windows.Forms.Application]::DoEvents()
+        }
+        catch 
+        {
+            
+        }
     }
-    catch 
+    else
     {
+        # Run silent
 
+        if(-not $tenantId)
+        {
+            # Core module not loaded yet so can't use log function
+            Write-Error "Tenant Id is missing. Use -TenantId <Tenant-guid> on the command line to run silent batch jobs"
+            return
+        }
+        $global:TenantId = $tenantId 
+        $global:AzureAppId = $appId 
+        $global:ClientSecret = $secret 
+        $global:ClientCert = $certificate        
     }
 
     if($ShowConsoleWindow -ne $true)
@@ -99,11 +137,27 @@ function Initialize-CloudAPIManagement
         Hide-Console
     }
 
-    $global:txtSplashText.Text = "Unblock files" 
+    if($JSonSettings -eq $true)
+    {
+        $global:UseJSonSettings = $true
+        $global:JSonSettingFile = $JSonFile
+    }
+    else
+    {
+        $global:UseJSonSettings = $false
+    }
+
+    if($global:hideUI -ne $true)
+    {
+        $global:txtSplashText.Text = "Unblock files"
+    } 
     [System.Windows.Forms.Application]::DoEvents()
     Unblock-AllFiles $PSScriptRoot
 
-    $global:txtSplashText.Text = "Load core module"
+    if($global:hideUI -ne $true)
+    {
+        $global:txtSplashText.Text = "Load core module"
+    }
     [System.Windows.Forms.Application]::DoEvents()
     Import-Module ($PSScriptRoot + "\Core.psm1") -Force -Global
 

Documentation.md

@@ -2,7 +2,7 @@
 
 The script can document most of the profiles and policies in Intune. The output can either be CSV or Word. Documenting to Word can either be to an existing Word template or empty document. There are many options for the documentation e.g. Language, Header styles, Table styles, managing not configured items etc.  
 
-The idea behind the documentation method in the script is to output the information as close to the Endpoint Manager portal as possible.  Some of the objects has a different property name or value in the Summary text vs Edit mode in the portal. The documentation will then use the Edit mode information when possible. Some policies and profiles might have a slightly different order that the portal.
+The idea behind the documentation method in the script is to output the information as close to the Endpoint Manager portal as possible. Some of the objects has a different property name or value in the Summary text vs Edit mode in the portal. The documentation will then use the Edit mode information when possible. Some policies and profiles might have a slightly different order that the portal.
 
 The objects can be documented in three ways:
 
@@ -18,11 +18,11 @@ The objects can be documented in three ways:
 
   Document all supported objects. Initiated in the Bulk menu 
 
-Documentation is a very complex process. There are multiple types of objects, different languages, different types of properties etc. The best output is often based on a personal opinion. Some parts can be configured but not everything can be personalized.  The output of most properties is simple, there is a name and a value. This is not the case for some properties e.g. a firewall rule. The firewall rule is itself a table with lots of possible values. The documentation will add the multi-property values with a property separator, comma is the default setting. There are also properties that contains multiple values. These will be added with an object separator, new line as default. The separators can be changed e.g. it might be better to use | as a object separator when documenting to a CSV.  
+Documentation is a very complex process. There are multiple types of objects, different languages, different types of properties etc. The best output is often based on a personal opinion. Some parts can be configured but not everything can be personalized. The output of most properties is simple, there is a name and a value. This is not the case for some properties e.g. a firewall rule. The firewall rule is itself a table with lots of possible values. The documentation will add the multi-property values with a property separator, comma is the default setting. There are also properties that contains multiple values. These will be added with an object separator, new line as default. The separators can be changed e.g. it might be better to use | as a object separator when documenting to a CSV.  
 
 **Note:** The word document might need some manual post updates. Tables are auto generated but they might have to be tweaked for personal preferences.      
 
-Please read the [Deep Dive](#deep-dive) section  below for a detailed description of the documentation process.
+Please read the [Deep Dive](#deep-dive) section below for a detailed description of the documentation process.
 
 **Language Support**
 
@@ -54,6 +54,8 @@ This is the first version of the documentation support.
 
 * Some Endpoint Security/Settings Catalog items is not translated based on Graph API in the portal e.g. *Antivirus - Windows 10 and Windows Server (ConfigMgr)* policies.  These will be documented based on Graph API information which might be different compared to the portal
 
+* Markdown is currently in experimental state. The script can document to an MD file created in the Documents folder but this can be to large in environments with many objects. The script will create HTML tables to support code blocks and column span. The MD View must support HTML tables to display the document. The *Markdown Viewer* extension in Chrome was used during testing.
+
 Please create an [Issue](https://github.com/Micke-K/IntuneManagement/issues) if properties are documented incorrectly or missing. 
 
 # Deep Dive
@@ -64,13 +66,13 @@ The documentation is based on a two step process
 
   This will collection all the information about the object and add it to a PowerShell object in the code
 
-* Send the information to the selected output type
+* Send the information to the selected output provider
 
   This will send all the information gathered about the object to the selected output provider
 
 These steps are then repeated for each object that is being documented.
 
-An output provider then has an initial (PreProcess) and finish (PostProcess) step e.g. the Word provider will create a word document  in the initial task, document all properties and then update content tables, word properties and save the document in the finish task.
+An output provider then has an initial (PreProcess) and finish (PostProcess) step e.g. the Word provider will create a word document in the initial task, document all properties and then update content tables, word properties and save the document in the finish task.
 
 **Object Types**
 
@@ -95,7 +97,7 @@ Json files for translating property objects to documentation is located in the D
 
 The generated files sometimes requires additional manually created properties. These could be properties in the UI that has a Yes/No, Enabled/Not Configured etc. trigger associated with a specific value. These properties must be manually added to the object before the documentation. The `DocumentationCustom.psm1` file takes care of this. This file is also used for overriding the documentation of specific values and other custom required processing.    
 
-The json files contains a definition of each property to document. This includes information like type e.g. Boolean (Yes/No, Allow/Block, Enabled/Disabled etc.),  Options, DataTable etc. The script will use these files to translate each property into PSCustomObject that is then used by the output provider. The functionality of these files has been extended to enhance the documentation options for the manually created files. Data types of 100 or above is custom functionality.  All data types below 100 is based on the same functionality as in the Intune portal. The data type engine in the script is created based on best effort of the generated json files. 
+The json files contains a definition of each property to document. This includes information like type e.g. Boolean (Yes/No, Allow/Block, Enabled/Disabled etc.), Options, DataTable etc. The script will use these files to translate each property into a PSCustomObject that is then used by the output provider. The functionality of these files has been extended to enhance the documentation options for the manually created files. Data types of 100 or above is custom functionality. All data types below 100 is based on the same functionality as in the Intune portal. The data type engine in the script is created based on best effort of the generated json files. 
 
 The `DocumentationCustom.psm1` file also takes care of custom documentation for some object types e.g. Conditional Access. App Configuration policies etc. These objects are documented via a PowerShell function in the script.
 
@@ -109,7 +111,7 @@ These files will have to be re-generated when new functionality is released in I
 
 **Scripts for Generated Files**
 
-The scripts that automatically generates language files, translation files, object info etc. are not included in the release. These scripts are currently not in a state that they can be released. The best would be if Microsoft released all the required information in Graph. A deep dive into graph suggests that it might be possible in the future since some information about the generated files are there but with some properties missing or missing. The information can't be accessed unless an API is called that gets the definition for all the profiles at the same time. 
+The scripts that automatically generates language files, translation files, object info etc. are not included in the release. These scripts are currently not in a state that they can be released. The best would be if Microsoft released all the required information in Graph. A deep dive into graph suggests that it might be possible in the future since some information about the generated files are there but with some properties missing or language text missing. The information can't be accessed unless an API is called that gets the definition for all the profiles at the same time (the file is over 100MB). 
 
 ## Extending The Documentation
 
@@ -130,15 +132,15 @@ The priority order for object documentation is:
 
 **Documentation Provider**
 
-The documentation provider takes care of the collection information about the object. The `DocumentationCustom.psm1`file is an example of this. This file has examples of custom translation of properties for json files and examples of custom translation of objects via a PowerShell functions.
+The documentation provider takes care of collecting all the information about the object. The `DocumentationCustom.psm1` file is an example of this. This file has examples of custom translation of properties for json files and examples of custom translation of objects via a PowerShell functions.
 
 Documentation providers has a Priority property. This defines in what order the providers will be triggered. The provider with the lowest priority number will be executed first. The included custom documentation provider has a priority number of 1000. The information gathering of the provider can be overridden by creating a custom documentation provider with a lower priority number.
 
 **Documentation Output Provider**
 
-Once the script has finished gathering all the data of an object, it sends it to the Documentation Output provider.  This will then document it to the specific output type of the provider. Word and CSV are included. There is also a "None" provider as included. This will only add the gathered information in the UI. This is used for quick information or when building the translation files. This is also used by the comparison functionality.
+Once the script has finished gathering all the data of an object, it sends it to the Documentation Output provider.  This will then document it to the specific output type of the provider. Word and CSV are included. There is also a "None" provider included. This will only add the gathered information in the UI. This is used for quick information or when building the translation files. This is also used by the comparison functionality.
 
-The`DocumentationWord.psm1` and `DocumentationWordOptions.xaml` files are example on how to create an output provider. The xaml file contains the configuration options in the UI. The psm1 file registers the provider and builds the Word document based on the gathered information.
+The `DocumentationWord.psm1` and `DocumentationWordOptions.xaml` files are example on how to create an output provider. The xaml file contains the configuration options in the UI. The psm1 file registers the provider and builds the Word document based on the gathered information.
 
 **Translation Files**
 

Documentation/CategoryId.json

@@ -1,4 +1,4 @@
-{
+{
     "0":  "AirPlay",
     "1":  "AirPrint",
     "2":  "AndroidDeviceOwnerApplications",
@@ -129,18 +129,19 @@
     "127":  "VPNIKEv2",
     "128":  "VPNProxy",
     "129":  "VPNTrustedNetwork",
-    "130":  "WebContentFilter",
+    "130":  "VPNCustomData",
-    "131":  "XboxServices",
+    "131":  "WebContentFilter",
-    "132":  "DomainJoin",
+    "132":  "XboxServices",
-    "133":  "WindowsDefenderAtp",
+    "133":  "DomainJoin",
-    "134":  "WindowsHelloForBusiness",
+    "134":  "WindowsDefenderAtp",
-    "135":  "DeviceFirmwareConfigurationInterface",
+    "135":  "WindowsHelloForBusiness",
-    "136":  "ZebraMx",
+    "136":  "DeviceFirmwareConfigurationInterface",
-    "137":  "AndroidDefenderAtp",
+    "137":  "ZebraMx",
-    "138":  "MacDefenderAtp",
+    "138":  "AndroidDefenderAtp",
-    "139":  "UserRights",
+    "139":  "MacDefenderAtp",
-    "140":  "WiredNetwork",
+    "140":  "UserRights",
-    "141":  "DefenderAntivirus",
+    "141":  "WiredNetwork",
-    "142":  "CustomCompliance",
+    "142":  "DefenderAntivirus",
-    "143":  "IosDefenderAtp"
+    "143":  "CustomCompliance",
+    "144":  "IosDefenderAtp"
 }

Documentation/ObjectInfo/#Applications.json

@@ -351,6 +351,22 @@
             ]
         }
     },
+    {
+        "nameResourceKey":  "OfficeSuiteAppsTab.xmlConfigurationLabel",
+        "descriptionResourceKey":  "",
+        "entityKey":  "MSAppsConfigXml",
+        "dataType":  20,
+        "booleanActions":  0,
+        "category": "OfficeSuiteAppsTab.appSuiteConfigurationLabel",        
+        "Condition": {
+            "Expressions": [
+                {
+                    "property": "@OData.Type",
+                    "value": "#microsoft.graph.officeSuiteApp"
+                }
+            ]
+        }                
+    },
     {
         "nameResourceKey":  "OfficeSuiteAppsTab.appsToBeInstalledLabel",
         "descriptionResourceKey":  "OfficeSuiteAppsTab.selectOfficeAppsTooltip",
@@ -393,7 +409,12 @@
             }
         ],
         "Condition": {
+            "type": "and",
             "Expressions": [
+                {
+                    "property": "MSAppsConfigXml",
+                    "operator": "null"
+                },
                 {
                     "property": "@OData.Type",
                     "value": "#microsoft.graph.officeSuiteApp"
@@ -419,7 +440,12 @@
             }
         ],
         "Condition": {
+            "type": "and",
             "Expressions": [
+                {
+                    "property": "MSAppsConfigXml",
+                    "operator": "null"
+                },
                 {
                     "property": "@OData.Type",
                     "value": "#microsoft.graph.officeSuiteApp"
@@ -433,7 +459,12 @@
         "dataType":  8,
         "booleanActions":  0,
         "Condition": {
+            "type": "and",
             "Expressions": [
+                {
+                    "property": "MSAppsConfigXml",
+                    "operator": "null"
+                },
                 {
                     "property": "@OData.Type",
                     "value": "#microsoft.graph.officeSuiteApp"
@@ -459,7 +490,12 @@
             }
         ],
         "Condition": {
+            "type": "and",
             "Expressions": [
+                {
+                    "property": "MSAppsConfigXml",
+                    "operator": "null"
+                },
                 {
                     "property": "@OData.Type",
                     "value": "#microsoft.graph.officeSuiteApp"
@@ -497,7 +533,12 @@
             }
         ],
         "Condition": {
+            "type": "and",
             "Expressions": [
+                {
+                    "property": "MSAppsConfigXml",
+                    "operator": "null"
+                },
                 {
                     "property": "@OData.Type",
                     "value": "#microsoft.graph.officeSuiteApp"
@@ -513,7 +554,12 @@
         "booleanActions":  109,
         "category": "OfficeSuiteAppsTab.appSuiteConfigurationLabel",        
         "Condition": {
+            "type": "and",
             "Expressions": [
+                {
+                    "property": "MSAppsConfigXml",
+                    "operator": "null"
+                },
                 {
                     "property": "@OData.Type",
                     "value": "#microsoft.graph.officeSuiteApp"
@@ -529,7 +575,12 @@
         "booleanActions":  0,
         "category": "OfficeSuiteAppsTab.appSuiteConfigurationLabel",        
         "Condition": {
+            "type": "and",
             "Expressions": [
+                {
+                    "property": "MSAppsConfigXml",
+                    "operator": "null"
+                },
                 {
                     "property": "@OData.Type",
                     "value": "#microsoft.graph.officeSuiteApp"
@@ -543,7 +594,12 @@
         "dataType":  8,
         "booleanActions":  0,
         "Condition": {
+            "type": "and",
             "Expressions": [
+                {
+                    "property": "MSAppsConfigXml",
+                    "operator": "null"
+                },
                 {
                     "property": "@OData.Type",
                     "value": "#microsoft.graph.officeSuiteApp"
@@ -559,7 +615,12 @@
         "booleanActions":  109,
         "category": "OfficeSuiteAppsTab.appSuiteConfigurationLabel",        
         "Condition": {
+            "type": "and",
             "Expressions": [
+                {
+                    "property": "MSAppsConfigXml",
+                    "operator": "null"
+                },
                 {
                     "property": "@OData.Type",
                     "value": "#microsoft.graph.officeSuiteApp"
@@ -575,7 +636,12 @@
         "booleanActions":  109,
         "category": "OfficeSuiteAppsTab.appSuiteConfigurationLabel",        
         "Condition": {
+            "type": "and",
             "Expressions": [
+                {
+                    "property": "MSAppsConfigXml",
+                    "operator": "null"
+                },
                 {
                     "property": "@OData.Type",
                     "value": "#microsoft.graph.officeSuiteApp"
@@ -591,7 +657,12 @@
         "booleanActions":  109,
         "category": "OfficeSuiteAppsTab.appSuiteConfigurationLabel",        
         "Condition": {
+            "type": "and",
             "Expressions": [
+                {
+                    "property": "MSAppsConfigXml",
+                    "operator": "null"
+                },
                 {
                     "property": "@OData.Type",
                     "value": "#microsoft.graph.officeSuiteApp"
@@ -607,7 +678,12 @@
         "booleanActions":  0,
         "category": "OfficeSuiteAppsTab.appSuiteConfigurationLabel",        
         "Condition": {
+            "type": "and",
             "Expressions": [
+                {
+                    "property": "MSAppsConfigXml",
+                    "operator": "null"
+                },
                 {
                     "property": "@OData.Type",
                     "value": "#microsoft.graph.officeSuiteApp"
@@ -660,7 +736,12 @@
         "category": "OfficeSuiteAppsTab.appSuiteConfigurationLabel",
         "unconfiguredValue": "os-default",
         "Condition": {
+            "type": "and",
             "Expressions": [
+                {
+                    "property": "MSAppsConfigXml",
+                    "operator": "null"
+                },
                 {
                     "property": "@OData.Type",
                     "value": "#microsoft.graph.officeSuiteApp"

Documentation/ObjectInfo/#microsoft.graph.deviceEnrollmentLimitConfiguration.json

@@ -0,0 +1,23 @@
+[
+    {
+        "dataType":  8,
+        "booleanActions":  0,
+        "category": "SettingDetails.deviceLimit"
+    },
+    {
+        "nameResourceKey":  "SettingDetails.deviceLimit",
+        "descriptionResourceKey":  "",
+        "entityKey":  "limit",
+        "dataType":  14,
+        "booleanActions":  0,
+        "category":  "SettingDetails.deviceLimit"
+    },
+    {
+        "nameResourceKey":  "TableHeaders.priority",
+        "descriptionResourceKey":  "",
+        "entityKey":  "priority",
+        "dataType":  14,
+        "booleanActions":  0,
+        "category":  "SettingDetails.deviceLimit"
+    }  
+]

Documentation/ObjectInfo/#microsoft.graph.deviceEnrollmentPlatformRestrictionsConfiguration.json

@@ -0,0 +1,417 @@
+[
+    {
+        "dataType":  8,
+        "booleanActions":  0,
+        "nameResourceKey": "Devices.androidWorkProfile"
+    },
+    {
+        "nameResourceKey":  "",
+        "descriptionResourceKey":  "",
+        "entityKey":  "androidForWorkRestriction",
+        "dataType":  6,
+        "booleanActions":  0,
+        "category": "",
+        "complexOptions": [
+            {
+                "nameResourceKey":  "TableHeaders.platform",
+                "descriptionResourceKey":  "",
+                "entityKey":  "platformBlocked",
+                "dataType":  0,
+                "booleanActions":  100,
+                "category":  "EnrollmentRestrictions.DeviceType.platformSettings",
+                "Children": {
+                    "nameResourceKey":  "",
+                    "descriptionResourceKey":  "",
+                    "entityKey":  "",
+                    "dataType":  5,
+                    "booleanActions":  0,
+                    "category": "",                    
+                    "Condition": {
+                        "Expressions": [
+                            {
+                                "property": "platformBlocked",
+                                "value": false
+                            }
+                        ]
+                    },
+                    "complexOptions": [
+                        {
+                            "nameResourceKey":  "EnrollmentRestrictions.DeviceType.versions",
+                            "descriptionResourceKey":  "",
+                            "entityKey":  ".",
+                            "dataType":  21,
+                            "separator": "-",
+                            "category": "EnrollmentRestrictions.DeviceType.platformSettings",                                                
+                            "Condition": {
+                                "type": "and",
+                                "Expressions": [
+                                    {
+                                        "property": "osMinimumVersion"
+                                    },
+                                    {
+                                        "property": "osMaximumVersion"
+                                    }
+                                ]
+                            },
+                            "Columns": [
+                                {
+                                    "metadata": {
+                                        "entityKey": "osMinimumVersion"
+                                    }
+                                },
+                                {
+                                    "metadata": {
+                                        "entityKey": "osMaximumVersion"
+                                    }
+                                }
+                            ]
+                        },                        
+                        {
+                            "nameResourceKey":  "EnrollmentRestrictions.DeviceType.personal",
+                            "descriptionResourceKey":  "",
+                            "entityKey":  "personalDeviceEnrollmentBlocked",
+                            "dataType":  0,
+                            "booleanActions":  100,
+                            "category":  "EnrollmentRestrictions.DeviceType.platformSettings"                        
+                        },
+                        {
+                            "nameResourceKey":  "EnrollmentRestrictions.DeviceType.blockManufacturersHeader",
+                            "descriptionResourceKey":  "",
+                            "entityKey":  "blockedManufacturers",
+                            "dataType":  21,
+                            "separator": "-",
+                            "category": "EnrollmentRestrictions.DeviceType.platformSettings",                                                
+                            "Condition": {
+                                "type": "and",
+                                "Expressions": [
+                                    {
+                                        "property": "blockedManufacturers"
+                                    }
+                                ]
+                            },
+                            "Columns": [
+                                {
+                                    "metadata": {
+                                        "entityKey": "unusedForSingleItems"
+                                    }
+                                }
+                            ]
+                        }
+                    ]
+                }                
+            }
+        ]
+    },
+    {
+        "dataType":  8,
+        "booleanActions":  0,
+        "nameResourceKey": "Devices.android"
+    },
+    {
+        "nameResourceKey":  "",
+        "descriptionResourceKey":  "",
+        "entityKey":  "androidRestriction",
+        "dataType":  6,
+        "booleanActions":  0,
+        "category": "",
+        "complexOptions": [
+            {
+                "nameResourceKey":  "TableHeaders.platform",
+                "descriptionResourceKey":  "",
+                "entityKey":  "platformBlocked",
+                "dataType":  0,
+                "booleanActions":  100,
+                "category":  "EnrollmentRestrictions.DeviceType.platformSettings",
+                "Children": {
+                    "nameResourceKey":  "",
+                    "descriptionResourceKey":  "",
+                    "entityKey":  "",
+                    "dataType":  5,
+                    "booleanActions":  0,
+                    "category": "",                    
+                    "Condition": {
+                        "Expressions": [
+                            {
+                                "property": "platformBlocked",
+                                "value": false
+                            }
+                        ]
+                    },
+                    "complexOptions": [
+                        {
+                            "nameResourceKey":  "EnrollmentRestrictions.DeviceType.versions",
+                            "descriptionResourceKey":  "",
+                            "entityKey":  ".",
+                            "dataType":  21,
+                            "separator": "-",
+                            "category": "EnrollmentRestrictions.DeviceType.platformSettings",                                                
+                            "Condition": {
+                                "type": "and",
+                                "Expressions": [
+                                    {
+                                        "property": "osMinimumVersion"
+                                    },
+                                    {
+                                        "property": "osMaximumVersion"
+                                    }
+                                ]
+                            },
+                            "Columns": [
+                                {
+                                    "metadata": {
+                                        "entityKey": "osMinimumVersion"
+                                    }
+                                },
+                                {
+                                    "metadata": {
+                                        "entityKey": "osMaximumVersion"
+                                    }
+                                }
+                            ]
+                        },                        
+                        {
+                            "nameResourceKey":  "EnrollmentRestrictions.DeviceType.personal",
+                            "descriptionResourceKey":  "",
+                            "entityKey":  "personalDeviceEnrollmentBlocked",
+                            "dataType":  0,
+                            "booleanActions":  100,
+                            "category":  "EnrollmentRestrictions.DeviceType.platformSettings"                        
+                        },
+                        {
+                            "nameResourceKey":  "EnrollmentRestrictions.DeviceType.blockManufacturersHeader",
+                            "descriptionResourceKey":  "",
+                            "entityKey":  "blockedManufacturers",
+                            "dataType":  21,
+                            "separator": "-",
+                            "category": "EnrollmentRestrictions.DeviceType.platformSettings",                                                
+                            "Condition": {
+                                "type": "and",
+                                "Expressions": [
+                                    {
+                                        "property": "blockedManufacturers"
+                                    }
+                                ]
+                            },
+                            "Columns": [
+                                {
+                                    "metadata": {
+                                        "entityKey": "unusedForSingleItems"
+                                    }
+                                }
+                            ]
+                        }
+                    ]
+                }                
+            }
+        ]
+    },
+    {
+        "dataType":  8,
+        "booleanActions":  0,
+        "nameResourceKey": "Devices.iOS"
+    },
+    {
+        "nameResourceKey":  "",
+        "descriptionResourceKey":  "",
+        "entityKey":  "iosRestriction",
+        "dataType":  6,
+        "booleanActions":  0,
+        "category": "",
+        "complexOptions": [
+            {
+                "nameResourceKey":  "TableHeaders.platform",
+                "descriptionResourceKey":  "",
+                "entityKey":  "platformBlocked",
+                "dataType":  0,
+                "booleanActions":  100,
+                "category":  "EnrollmentRestrictions.DeviceType.platformSettings",
+                "Children": {
+                    "nameResourceKey":  "",
+                    "descriptionResourceKey":  "",
+                    "entityKey":  "",
+                    "dataType":  5,
+                    "booleanActions":  0,
+                    "category": "",                    
+                    "Condition": {
+                        "Expressions": [
+                            {
+                                "property": "platformBlocked",
+                                "value": false
+                            }
+                        ]
+                    },
+                    "complexOptions": [
+                        {
+                            "nameResourceKey":  "EnrollmentRestrictions.DeviceType.versions",
+                            "descriptionResourceKey":  "",
+                            "entityKey":  ".",
+                            "dataType":  21,
+                            "separator": "-",
+                            "category": "EnrollmentRestrictions.DeviceType.platformSettings",                                                
+                            "Condition": {
+                                "type": "and",
+                                "Expressions": [
+                                    {
+                                        "property": "osMinimumVersion"
+                                    },
+                                    {
+                                        "property": "osMaximumVersion"
+                                    }
+                                ]
+                            },
+                            "Columns": [
+                                {
+                                    "metadata": {
+                                        "entityKey": "osMinimumVersion"
+                                    }
+                                },
+                                {
+                                    "metadata": {
+                                        "entityKey": "osMaximumVersion"
+                                    }
+                                }
+                            ]
+                        },                        
+                        {
+                            "nameResourceKey":  "EnrollmentRestrictions.DeviceType.personal",
+                            "descriptionResourceKey":  "",
+                            "entityKey":  "personalDeviceEnrollmentBlocked",
+                            "dataType":  0,
+                            "booleanActions":  100,
+                            "category":  "EnrollmentRestrictions.DeviceType.platformSettings"                        
+                        }
+                    ]
+                }                
+            }
+        ]
+    },
+    {
+        "dataType":  8,
+        "booleanActions":  0,
+        "nameResourceKey": "Devices.mac"
+    },
+    {
+        "nameResourceKey":  "",
+        "descriptionResourceKey":  "",
+        "entityKey":  "macRestriction",
+        "dataType":  6,
+        "booleanActions":  0,
+        "category": "",
+        "complexOptions": [
+            {
+                "nameResourceKey":  "TableHeaders.platform",
+                "descriptionResourceKey":  "",
+                "entityKey":  "platformBlocked",
+                "dataType":  0,
+                "booleanActions":  100,
+                "category":  "EnrollmentRestrictions.DeviceType.platformSettings",
+                "Children": {
+                    "nameResourceKey":  "",
+                    "descriptionResourceKey":  "",
+                    "entityKey":  "",
+                    "dataType":  5,
+                    "booleanActions":  0,
+                    "category": "",                    
+                    "Condition": {
+                        "Expressions": [
+                            {
+                                "property": "platformBlocked",
+                                "value": false
+                            }
+                        ]
+                    },
+                    "complexOptions": [                                               
+                        {
+                            "nameResourceKey":  "EnrollmentRestrictions.DeviceType.personal",
+                            "descriptionResourceKey":  "",
+                            "entityKey":  "personalDeviceEnrollmentBlocked",
+                            "dataType":  0,
+                            "booleanActions":  100,
+                            "category":  "EnrollmentRestrictions.DeviceType.platformSettings"                        
+                        }
+                    ]
+                }                
+            }
+        ]
+    },
+    {
+        "dataType":  8,
+        "booleanActions":  0,
+        "nameResourceKey": "Devices.windows"
+    },
+    {
+        "nameResourceKey":  "",
+        "descriptionResourceKey":  "",
+        "entityKey":  "windowsRestriction",
+        "dataType":  6,
+        "booleanActions":  0,
+        "category": "",
+        "complexOptions": [
+            {
+                "nameResourceKey":  "TableHeaders.platform",
+                "descriptionResourceKey":  "",
+                "entityKey":  "platformBlocked",
+                "dataType":  0,
+                "booleanActions":  100,
+                "category":  "EnrollmentRestrictions.DeviceType.platformSettings",
+                "Children": {
+                    "nameResourceKey":  "",
+                    "descriptionResourceKey":  "",
+                    "entityKey":  "",
+                    "dataType":  5,
+                    "booleanActions":  0,
+                    "category": "",                    
+                    "Condition": {
+                        "Expressions": [
+                            {
+                                "property": "platformBlocked",
+                                "value": false
+                            }
+                        ]
+                    },
+                    "complexOptions": [
+                        {
+                            "nameResourceKey":  "EnrollmentRestrictions.DeviceType.versions",
+                            "descriptionResourceKey":  "",
+                            "entityKey":  ".",
+                            "dataType":  21,
+                            "separator": "-",
+                            "category": "EnrollmentRestrictions.DeviceType.platformSettings",                                                
+                            "Condition": {
+                                "type": "and",
+                                "Expressions": [
+                                    {
+                                        "property": "osMinimumVersion"
+                                    },
+                                    {
+                                        "property": "osMaximumVersion"
+                                    }
+                                ]
+                            },
+                            "Columns": [
+                                {
+                                    "metadata": {
+                                        "entityKey": "osMinimumVersion"
+                                    }
+                                },
+                                {
+                                    "metadata": {
+                                        "entityKey": "osMaximumVersion"
+                                    }
+                                }
+                            ]
+                        },                        
+                        {
+                            "nameResourceKey":  "EnrollmentRestrictions.DeviceType.personal",
+                            "descriptionResourceKey":  "",
+                            "entityKey":  "personalDeviceEnrollmentBlocked",
+                            "dataType":  0,
+                            "booleanActions":  100,
+                            "category":  "EnrollmentRestrictions.DeviceType.platformSettings"                        
+                        }
+                    ]
+                }                
+            }
+        ]
+    }
+]

Documentation/ObjectInfo/#microsoft.graph.deviceHealthScript.json

@@ -0,0 +1,41 @@
+[
+    {
+        "nameResourceKey":  "ProactiveRemediations.Create.Settings.DetectionScriptMultiLineTextBox.label",
+        "descriptionResourceKey":  "",
+        "entityKey":  "detectionScriptAdded",
+        "dataType":  0,
+        "booleanActions":  109,
+        "category": "WindowsManagement.scriptsettingsTabHeader"
+    },
+    {
+        "nameResourceKey":  "ProactiveRemediations.Create.Settings.RemediationScriptMultiLineTextBox.label",
+        "descriptionResourceKey":  "",
+        "entityKey":  "remediationScriptAdded",
+        "dataType":  0,
+        "booleanActions":  109,
+        "category": "WindowsManagement.scriptsettingsTabHeader"
+    },
+    {
+        "nameResourceKey":  "ProactiveRemediations.Create.Settings.LoggedOnCredentialsOptionPicker.label",
+        "descriptionResourceKey":  "",
+        "entityKey":  "useLoggedOnCredentials",
+        "dataType":  0,
+        "booleanActions":  109
+    },
+    {
+        "nameResourceKey":  "ProactiveRemediations.Create.Settings.EnforceScriptSignatureCheckOptionPicker.label",
+        "descriptionResourceKey":  "",
+        "entityKey":  "enforceSignatureCheck",
+        "dataType":  0,
+        "booleanActions":  109
+
+    },
+    {
+        "nameResourceKey":  "ProactiveRemediations.Create.Settings.RunIn64BitPSOptionPicker.label",
+        "descriptionResourceKey":  "",
+        "entityKey":  "runAs32Bit",
+        "dataType":  0,
+        "booleanActions":  110
+
+    }
+]

Documentation/ObjectInfo/#microsoft.graph.deviceManagementScript.json

@@ -46,9 +46,9 @@
     {
         "nameResourceKey":  "WindowsManagement.runAs64BitLabel",
         "descriptionResourceKey":  "WindowsManagement.runAs64BitInfoBalloonContent",
-        "entityKey":  "enforceSignatureCheck",
+        "entityKey":  "runAs32Bit",
         "dataType":  0,
-        "booleanActions":  109,
+        "booleanActions":  110,
         "category": "WindowsManagement.scriptsettingsTabHeader"
     }  
 ]

Documentation/ObjectInfo/#microsoft.graph.windowsFeatureUpdateProfile.json

@@ -14,5 +14,66 @@
         "dataType":  20,
         "booleanActions":  0,
         "category":  "WindowsFeatureUpdateProfile.Details.deploymentSettingsTitle"
+    },
+    {
+        "nameResourceKey":  "WindowsFeatureUpdateProfile.Details.RolloutOptions.label",
+        "descriptionResourceKey":  "",
+        "entityKey":  "featureUpdateRolloutOption",
+        "dataType":  16,
+        "booleanActions":  0,
+        "category": "WindowsFeatureUpdateProfile.Details.deploymentSettingsTitle",
+        "options":  [
+            {
+                "nameResourceKey":  "WindowsUpdateRolloutOptions.immediateStart",
+                "descriptionResourceKey":  "",
+                "value":  "immediateStart"
+            },
+            {
+                "nameResourceKey":  "WindowsUpdateRolloutOptions.gradualRollout",
+                "descriptionResourceKey":  "",
+                "value":  "gradualRollout",
+                "ChildSettings": [
+                    {
+                        "nameResourceKey":  "WindowsFeatureUpdateProfile.Details.GradualRolloutStartDate.label",
+                        "descriptionResourceKey":  "",
+                        "dataType":  20,
+                        "category":  "WindowsFeatureUpdateProfile.Details.deploymentSettingsTitle",
+                        "entityKey":  "featureUpdateRolloutStartDate",
+                        "booleanActions":  0
+                    },
+                    {
+                        "nameResourceKey":  "WindowsFeatureUpdateProfile.Details.GradualRolloutEndDate.label",
+                        "descriptionResourceKey":  "",
+                        "dataType":  20,
+                        "category":  "WindowsFeatureUpdateProfile.Details.deploymentSettingsTitle",
+                        "entityKey":  "featureUpdateRolloutEndDate",
+                        "booleanActions":  0
+                    },
+                    {
+                        "nameResourceKey":  "WindowsFeatureUpdateProfile.Details.GradualRolloutInterval.label",
+                        "descriptionResourceKey":  "",
+                        "dataType":  20,
+                        "category":  "WindowsFeatureUpdateProfile.Details.deploymentSettingsTitle",
+                        "entityKey":  "featureUpdateRolloutInterval",
+                        "booleanActions":  0
+                    }                                        
+                ]                
+            },
+            {
+                "nameResourceKey":  "WindowsUpdateRolloutOptions.startDateOnly",
+                "descriptionResourceKey":  "",
+                "value":  "startDateOnly",
+                "ChildSettings": [
+                    {
+                        "nameResourceKey":  "WindowsFeatureUpdateProfile.Details.GradualRolloutStartDate.label",
+                        "descriptionResourceKey":  "",
+                        "dataType":  20,
+                        "category":  "WindowsFeatureUpdateProfile.Details.deploymentSettingsTitle",
+                        "entityKey":  "featureUpdateRolloutStartDate",
+                        "booleanActions":  0
+                    }
+                ]
+            }
+        ]
     }    
 ]

Documentation/ObjectInfo/airprint_iosdevicefeatures.json

@@ -13,7 +13,7 @@
 
                                                        ],
                                            "booleanActions":  0,
-                                           "policyType":  41,
+                                           "policyType":  42,
                                            "enabled":  true
                                        },
                                        {
@@ -41,7 +41,7 @@
                                                                                                                       ],
                                                                                                           "entityKey":  "ipAddress",
                                                                                                           "booleanActions":  0,
-                                                                                                          "policyType":  41,
+                                                                                                          "policyType":  42,
                                                                                                           "enabled":  true
                                                                                                       }
                                                                                      },
@@ -60,7 +60,7 @@
                                                                                                                       ],
                                                                                                           "entityKey":  "resourcePath",
                                                                                                           "booleanActions":  0,
-                                                                                                          "policyType":  41,
+                                                                                                          "policyType":  42,
                                                                                                           "enabled":  true
                                                                                                       }
                                                                                      },
@@ -79,7 +79,7 @@
                                                                                                                       ],
                                                                                                           "entityKey":  "port",
                                                                                                           "booleanActions":  0,
-                                                                                                          "policyType":  41,
+                                                                                                          "policyType":  42,
                                                                                                           "enabled":  true
                                                                                                       }
                                                                                      },
@@ -107,7 +107,7 @@
                                                                                                           "entityKey":  "forceTls",
                                                                                                           "booleanActions":  0,
                                                                                                           "defaultValue":  "false",
-                                                                                                          "policyType":  41,
+                                                                                                          "policyType":  42,
                                                                                                           "enabled":  true
                                                                                                       }
                                                                                      }
@@ -123,7 +123,7 @@
                                                                                  ],
                                                                      "entityKey":  "airPrintDestinations",
                                                                      "booleanActions":  0,
-                                                                     "policyType":  41,
+                                                                     "policyType":  42,
                                                                      "enabled":  true
                                                                  }
                                                              ],
@@ -131,7 +131,7 @@
 
                                                        ],
                                            "booleanActions":  0,
-                                           "policyType":  41,
+                                           "policyType":  42,
                                            "enabled":  true
                                        }
                                    ]

Documentation/ObjectInfo/airprint_macdevicefeatures.json

@@ -13,7 +13,7 @@
 
                                                        ],
                                            "booleanActions":  0,
-                                           "policyType":  57,
+                                           "policyType":  58,
                                            "enabled":  true
                                        },
                                        {
@@ -41,7 +41,7 @@
                                                                                                                       ],
                                                                                                           "entityKey":  "ipAddress",
                                                                                                           "booleanActions":  0,
-                                                                                                          "policyType":  57,
+                                                                                                          "policyType":  58,
                                                                                                           "enabled":  true
                                                                                                       }
                                                                                      },
@@ -60,7 +60,7 @@
                                                                                                                       ],
                                                                                                           "entityKey":  "resourcePath",
                                                                                                           "booleanActions":  0,
-                                                                                                          "policyType":  57,
+                                                                                                          "policyType":  58,
                                                                                                           "enabled":  true
                                                                                                       }
                                                                                      },
@@ -79,7 +79,7 @@
                                                                                                                       ],
                                                                                                           "entityKey":  "port",
                                                                                                           "booleanActions":  0,
-                                                                                                          "policyType":  57,
+                                                                                                          "policyType":  58,
                                                                                                           "enabled":  true
                                                                                                       }
                                                                                      },
@@ -107,7 +107,7 @@
                                                                                                           "entityKey":  "forceTls",
                                                                                                           "booleanActions":  0,
                                                                                                           "defaultValue":  "false",
-                                                                                                          "policyType":  57,
+                                                                                                          "policyType":  58,
                                                                                                           "enabled":  true
                                                                                                       }
                                                                                      }
@@ -123,7 +123,7 @@
                                                                                  ],
                                                                      "entityKey":  "airPrintDestinations",
                                                                      "booleanActions":  0,
-                                                                     "policyType":  57,
+                                                                     "policyType":  58,
                                                                      "enabled":  true
                                                                  }
                                                              ],
@@ -131,7 +131,7 @@
 
                                                        ],
                                            "booleanActions":  0,
-                                           "policyType":  57,
+                                           "policyType":  58,
                                            "enabled":  true
                                        }
                                    ]

Documentation/ObjectInfo/androiddefenderatp_complianceandroid.json

@@ -3,12 +3,12 @@
                                                  "isSettingDescription":  false,
                                                  "showAsSectionHeader":  false,
                                                  "dataType":  8,
-                                                 "category":  137,
+                                                 "category":  138,
                                                  "nameResourceKey":  "complianceAtpDeviceRiskHeader",
                                                  "childSettings":  [
                                                                        {
                                                                            "dataType":  16,
-                                                                           "category":  137,
+                                                                           "category":  138,
                                                                            "nameResourceKey":  "complianceDeviceRiskATPRequirementName",
                                                                            "descriptionResourceKey":  "complianceDeviceRiskATPRequirementDescription",
                                                                            "childSettings":  [

Documentation/ObjectInfo/androiddefenderatp_complianceandroiddeviceowner.json

@@ -3,12 +3,12 @@
                                                             "isSettingDescription":  false,
                                                             "showAsSectionHeader":  false,
                                                             "dataType":  8,
-                                                            "category":  137,
+                                                            "category":  138,
                                                             "nameResourceKey":  "complianceAtpDeviceRiskHeader",
                                                             "childSettings":  [
                                                                                   {
                                                                                       "dataType":  16,
-                                                                                      "category":  137,
+                                                                                      "category":  138,
                                                                                       "nameResourceKey":  "complianceDeviceRiskATPRequirementName",
                                                                                       "descriptionResourceKey":  "complianceDeviceRiskATPRequirementDescription",
                                                                                       "childSettings":  [

Documentation/ObjectInfo/androiddefenderatp_complianceandroidforwork.json

@@ -3,12 +3,12 @@
                                                         "isSettingDescription":  false,
                                                         "showAsSectionHeader":  false,
                                                         "dataType":  8,
-                                                        "category":  137,
+                                                        "category":  138,
                                                         "nameResourceKey":  "complianceAtpDeviceRiskHeader",
                                                         "childSettings":  [
                                                                               {
                                                                                   "dataType":  16,
-                                                                                  "category":  137,
+                                                                                  "category":  138,
                                                                                   "nameResourceKey":  "complianceDeviceRiskATPRequirementName",
                                                                                   "descriptionResourceKey":  "complianceDeviceRiskATPRequirementDescription",
                                                                                   "childSettings":  [

Documentation/ObjectInfo/androiddeviceownerapplications_androiddeviceownergeneral.json

@@ -90,7 +90,20 @@
                                                                                                    "nameResourceKey":  "publicPlayStoreEnabledName",
                                                                                                    "descriptionResourceKey":  "publicPlayStoreEnabledDescription",
                                                                                                    "childSettings":  [
+                                                                                                                         {
+                                                                                                                             "dataType":  10,
+                                                                                                                             "category":  2,
+                                                                                                                             "nameResourceKey":  "publicPlayStoreEnabledWarning",
+                                                                                                                             "childSettings":  [
 
+                                                                                                                                               ],
+                                                                                                                             "options":  [
+
+                                                                                                                                         ],
+                                                                                                                             "booleanActions":  0,
+                                                                                                                             "policyType":  2,
+                                                                                                                             "enabled":  true
+                                                                                                                         }
                                                                                                                      ],
                                                                                                    "options":  [
 
@@ -108,6 +121,112 @@
                                                                          "booleanActions":  0,
                                                                          "policyType":  2,
                                                                          "enabled":  true
+                                                                     },
+                                                                     {
+                                                                         "isSettingDescription":  false,
+                                                                         "showAsSectionHeader":  true,
+                                                                         "dataType":  8,
+                                                                         "category":  2,
+                                                                         "nameResourceKey":  "dedicatedAndroidEnrollmentTypesHeaderName",
+                                                                         "descriptionResourceKey":  "dedicatedAndroidEnrollmentTypesHeaderDescription",
+                                                                         "childSettings":  [
+                                                                                               {
+                                                                                                   "columns":  [
+                                                                                                                   {
+                                                                                                                       "metadata":  {
+                                                                                                                                        "dataType":  20,
+                                                                                                                                        "category":  2,
+                                                                                                                                        "nameResourceKey":  "appNameName",
+                                                                                                                                        "descriptionResourceKey":  "Empty",
+                                                                                                                                        "childSettings":  [
+
+                                                                                                                                                          ],
+                                                                                                                                        "options":  [
+
+                                                                                                                                                    ],
+                                                                                                                                        "entityKey":  "name",
+                                                                                                                                        "booleanActions":  0,
+                                                                                                                                        "policyType":  2,
+                                                                                                                                        "enabled":  false
+                                                                                                                                    }
+                                                                                                                   },
+                                                                                                                   {
+                                                                                                                       "metadata":  {
+                                                                                                                                        "dataType":  20,
+                                                                                                                                        "category":  2,
+                                                                                                                                        "nameResourceKey":  "packageName",
+                                                                                                                                        "descriptionResourceKey":  "Empty",
+                                                                                                                                        "childSettings":  [
+
+                                                                                                                                                          ],
+                                                                                                                                        "options":  [
+
+                                                                                                                                                    ],
+                                                                                                                                        "entityKey":  "appId",
+                                                                                                                                        "booleanActions":  0,
+                                                                                                                                        "policyType":  2,
+                                                                                                                                        "enabled":  false
+                                                                                                                                    }
+                                                                                                                   },
+                                                                                                                   {
+                                                                                                                       "metadata":  {
+                                                                                                                                        "dataType":  20,
+                                                                                                                                        "category":  2,
+                                                                                                                                        "nameResourceKey":  "appUrlName",
+                                                                                                                                        "descriptionResourceKey":  "Empty",
+                                                                                                                                        "childSettings":  [
+
+                                                                                                                                                          ],
+                                                                                                                                        "options":  [
+
+                                                                                                                                                    ],
+                                                                                                                                        "entityKey":  "appStoreUrl",
+                                                                                                                                        "booleanActions":  0,
+                                                                                                                                        "policyType":  2,
+                                                                                                                                        "enabled":  false
+                                                                                                                                    }
+                                                                                                                   },
+                                                                                                                   {
+                                                                                                                       "metadata":  {
+                                                                                                                                        "dataType":  20,
+                                                                                                                                        "category":  2,
+                                                                                                                                        "nameResourceKey":  "appPublisherName",
+                                                                                                                                        "descriptionResourceKey":  "Empty",
+                                                                                                                                        "childSettings":  [
+
+                                                                                                                                                          ],
+                                                                                                                                        "options":  [
+
+                                                                                                                                                    ],
+                                                                                                                                        "entityKey":  "publisher",
+                                                                                                                                        "booleanActions":  0,
+                                                                                                                                        "policyType":  2,
+                                                                                                                                        "enabled":  false
+                                                                                                                                    }
+                                                                                                                   }
+                                                                                                               ],
+                                                                                                   "dataType":  21,
+                                                                                                   "category":  2,
+                                                                                                   "nameResourceKey":  "aadSharedDeviceDataClearAppsName",
+                                                                                                   "descriptionResourceKey":  "aadSharedDeviceDataClearAppsDescription",
+                                                                                                   "childSettings":  [
+
+                                                                                                                     ],
+                                                                                                   "options":  [
+
+                                                                                                               ],
+                                                                                                   "entityKey":  "azureAdSharedDeviceDataClearApps",
+                                                                                                   "booleanActions":  0,
+                                                                                                   "policyType":  2,
+                                                                                                   "enabled":  false
+                                                                                               }
+                                                                                           ],
+                                                                         "options":  [
+
+                                                                                     ],
+                                                                         "booleanActions":  0,
+                                                                         "policyType":  2,
+                                                                         "enabled":  false
                                                                      }
                                                                  ]
 }

Documentation/ObjectInfo/applicationguard_windows10endpointprotection.json

@@ -11,7 +11,7 @@
 
                                                                          ],
                                                              "booleanActions":  0,
-                                                             "policyType":  76,
+                                                             "policyType":  77,
                                                              "enabled":  true
                                                          },
                                                          {
@@ -72,7 +72,7 @@
                                                                                                                                 "booleanActions":  0,
                                                                                                                                 "defaultValue":  "notConfigured",
                                                                                                                                 "unconfiguredValue":  "notConfigured",
-                                                                                                                                "policyType":  76,
+                                                                                                                                "policyType":  77,
                                                                                                                                 "enabled":  true
                                                                                                                             }
                                                                                                                         ],
@@ -116,7 +116,7 @@
                                                                                                                                 "booleanActions":  0,
                                                                                                                                 "defaultValue":  "notConfigured",
                                                                                                                                 "unconfiguredValue":  "notConfigured",
-                                                                                                                                "policyType":  76,
+                                                                                                                                "policyType":  77,
                                                                                                                                 "enabled":  true
                                                                                                                             }
                                                                                                                         ],
@@ -160,7 +160,7 @@
                                                                                                                                 "booleanActions":  0,
                                                                                                                                 "defaultValue":  "notConfigured",
                                                                                                                                 "unconfiguredValue":  "notConfigured",
-                                                                                                                                "policyType":  76,
+                                                                                                                                "policyType":  77,
                                                                                                                                 "enabled":  true
                                                                                                                             }
                                                                                                                         ],
@@ -176,7 +176,7 @@
                                                                                        "booleanActions":  0,
                                                                                        "defaultValue":  "notConfigured",
                                                                                        "unconfiguredValue":  "notConfigured",
-                                                                                       "policyType":  76,
+                                                                                       "policyType":  77,
                                                                                        "enabled":  true
                                                                                    },
                                                                                    {
@@ -194,7 +194,7 @@
                                                                                        "booleanActions":  3,
                                                                                        "defaultValue":  false,
                                                                                        "unconfiguredValue":  false,
-                                                                                       "policyType":  76,
+                                                                                       "policyType":  77,
                                                                                        "enabled":  true
                                                                                    },
                                                                                    {
@@ -236,7 +236,7 @@
                                                                                                                              ],
                                                                                                                  "entityKey":  "applicationGuardPrintSettings",
                                                                                                                  "booleanActions":  0,
-                                                                                                                 "policyType":  76,
+                                                                                                                 "policyType":  77,
                                                                                                                  "enabled":  true
                                                                                                              }
                                                                                                          ],
@@ -247,7 +247,7 @@
                                                                                        "booleanActions":  0,
                                                                                        "defaultValue":  false,
                                                                                        "unconfiguredValue":  false,
-                                                                                       "policyType":  76,
+                                                                                       "policyType":  77,
                                                                                        "enabled":  true
                                                                                    },
                                                                                    {
@@ -265,7 +265,7 @@
                                                                                        "booleanActions":  0,
                                                                                        "defaultValue":  false,
                                                                                        "unconfiguredValue":  false,
-                                                                                       "policyType":  76,
+                                                                                       "policyType":  77,
                                                                                        "enabled":  true
                                                                                    },
                                                                                    {
@@ -283,7 +283,7 @@
                                                                                        "booleanActions":  0,
                                                                                        "defaultValue":  false,
                                                                                        "unconfiguredValue":  false,
-                                                                                       "policyType":  76,
+                                                                                       "policyType":  77,
                                                                                        "enabled":  true
                                                                                    },
                                                                                    {
@@ -301,7 +301,7 @@
                                                                                        "booleanActions":  2,
                                                                                        "defaultValue":  false,
                                                                                        "unconfiguredValue":  false,
-                                                                                       "policyType":  76,
+                                                                                       "policyType":  77,
                                                                                        "enabled":  true
                                                                                    },
                                                                                    {
@@ -319,7 +319,7 @@
                                                                                        "booleanActions":  2,
                                                                                        "defaultValue":  false,
                                                                                        "unconfiguredValue":  false,
-                                                                                       "policyType":  76,
+                                                                                       "policyType":  77,
                                                                                        "enabled":  true
                                                                                    }
                                                                                ],
@@ -330,7 +330,7 @@
                                                              "booleanActions":  2,
                                                              "defaultValue":  false,
                                                              "unconfiguredValue":  false,
-                                                             "policyType":  76,
+                                                             "policyType":  77,
                                                              "enabled":  false
                                                          },
                                                          {
@@ -391,7 +391,7 @@
                                                                                                                                 "booleanActions":  0,
                                                                                                                                 "defaultValue":  "notConfigured",
                                                                                                                                 "unconfiguredValue":  "notConfigured",
-                                                                                                                                "policyType":  76,
+                                                                                                                                "policyType":  77,
                                                                                                                                 "enabled":  true
                                                                                                                             }
                                                                                                                         ],
@@ -435,7 +435,7 @@
                                                                                                                                 "booleanActions":  0,
                                                                                                                                 "defaultValue":  "notConfigured",
                                                                                                                                 "unconfiguredValue":  "notConfigured",
-                                                                                                                                "policyType":  76,
+                                                                                                                                "policyType":  77,
                                                                                                                                 "enabled":  true
                                                                                                                             }
                                                                                                                         ],
@@ -479,7 +479,7 @@
                                                                                                                                 "booleanActions":  0,
                                                                                                                                 "defaultValue":  "notConfigured",
                                                                                                                                 "unconfiguredValue":  "notConfigured",
-                                                                                                                                "policyType":  76,
+                                                                                                                                "policyType":  77,
                                                                                                                                 "enabled":  true
                                                                                                                             }
                                                                                                                         ],
@@ -495,7 +495,7 @@
                                                                                        "booleanActions":  0,
                                                                                        "defaultValue":  "notConfigured",
                                                                                        "unconfiguredValue":  "notConfigured",
-                                                                                       "policyType":  76,
+                                                                                       "policyType":  77,
                                                                                        "enabled":  true
                                                                                    },
                                                                                    {
@@ -513,7 +513,7 @@
                                                                                        "booleanActions":  3,
                                                                                        "defaultValue":  false,
                                                                                        "unconfiguredValue":  false,
-                                                                                       "policyType":  76,
+                                                                                       "policyType":  77,
                                                                                        "enabled":  true
                                                                                    },
                                                                                    {
@@ -555,7 +555,7 @@
                                                                                                                              ],
                                                                                                                  "entityKey":  "applicationGuardPrintSettings",
                                                                                                                  "booleanActions":  0,
-                                                                                                                 "policyType":  76,
+                                                                                                                 "policyType":  77,
                                                                                                                  "enabled":  true
                                                                                                              }
                                                                                                          ],
@@ -566,7 +566,7 @@
                                                                                        "booleanActions":  0,
                                                                                        "defaultValue":  false,
                                                                                        "unconfiguredValue":  false,
-                                                                                       "policyType":  76,
+                                                                                       "policyType":  77,
                                                                                        "enabled":  true
                                                                                    },
                                                                                    {
@@ -584,7 +584,7 @@
                                                                                        "booleanActions":  0,
                                                                                        "defaultValue":  false,
                                                                                        "unconfiguredValue":  false,
-                                                                                       "policyType":  76,
+                                                                                       "policyType":  77,
                                                                                        "enabled":  true
                                                                                    },
                                                                                    {
@@ -602,7 +602,7 @@
                                                                                        "booleanActions":  0,
                                                                                        "defaultValue":  false,
                                                                                        "unconfiguredValue":  false,
-                                                                                       "policyType":  76,
+                                                                                       "policyType":  77,
                                                                                        "enabled":  true
                                                                                    },
                                                                                    {
@@ -620,7 +620,7 @@
                                                                                        "booleanActions":  2,
                                                                                        "defaultValue":  false,
                                                                                        "unconfiguredValue":  false,
-                                                                                       "policyType":  76,
+                                                                                       "policyType":  77,
                                                                                        "enabled":  true
                                                                                    },
                                                                                    {
@@ -638,7 +638,7 @@
                                                                                        "booleanActions":  2,
                                                                                        "defaultValue":  false,
                                                                                        "unconfiguredValue":  false,
-                                                                                       "policyType":  76,
+                                                                                       "policyType":  77,
                                                                                        "enabled":  true
                                                                                    }
                                                                                ],
@@ -658,7 +658,7 @@
                                                              "booleanActions":  0,
                                                              "defaultValue":  "notConfigured",
                                                              "unconfiguredValue":  "notConfigured",
-                                                             "policyType":  76,
+                                                             "policyType":  77,
                                                              "enabled":  true
                                                          }
                                                      ]

Documentation/ObjectInfo/applicationrestrictions_iosgeneral.json

@@ -13,7 +13,7 @@
 
                                                                ],
                                                    "booleanActions":  0,
-                                                   "policyType":  45,
+                                                   "policyType":  46,
                                                    "enabled":  true
                                                },
                                                {
@@ -47,7 +47,7 @@
                                                                                                                                                         ],
                                                                                                                                             "entityKey":  "appStoreUrl",
                                                                                                                                             "booleanActions":  0,
-                                                                                                                                            "policyType":  45,
+                                                                                                                                            "policyType":  46,
                                                                                                                                             "enabled":  true
                                                                                                                                         }
                                                                                                                        },
@@ -66,7 +66,7 @@
                                                                                                                                                         ],
                                                                                                                                             "entityKey":  "appId",
                                                                                                                                             "booleanActions":  0,
-                                                                                                                                            "policyType":  45,
+                                                                                                                                            "policyType":  46,
                                                                                                                                             "enabled":  true
                                                                                                                                         }
                                                                                                                        },
@@ -84,7 +84,7 @@
                                                                                                                                                         ],
                                                                                                                                             "entityKey":  "name",
                                                                                                                                             "booleanActions":  0,
-                                                                                                                                            "policyType":  45,
+                                                                                                                                            "policyType":  46,
                                                                                                                                             "enabled":  true
                                                                                                                                         }
                                                                                                                        },
@@ -102,7 +102,7 @@
                                                                                                                                                         ],
                                                                                                                                             "entityKey":  "publisher",
                                                                                                                                             "booleanActions":  0,
-                                                                                                                                            "policyType":  45,
+                                                                                                                                            "policyType":  46,
                                                                                                                                             "enabled":  true
                                                                                                                                         }
                                                                                                                        }
@@ -119,7 +119,7 @@
                                                                                                                    ],
                                                                                                        "entityKey":  "compliantAppsList",
                                                                                                        "booleanActions":  0,
-                                                                                                       "policyType":  45,
+                                                                                                       "policyType":  46,
                                                                                                        "enabled":  true
                                                                                                    }
                                                                                                ],
@@ -144,7 +144,7 @@
                                                                              "booleanActions":  0,
                                                                              "defaultValue":  "none",
                                                                              "unconfiguredValue":  "none",
-                                                                             "policyType":  45,
+                                                                             "policyType":  46,
                                                                              "enabled":  true
                                                                          }
                                                                      ],
@@ -152,7 +152,7 @@
 
                                                                ],
                                                    "booleanActions":  0,
-                                                   "policyType":  45,
+                                                   "policyType":  46,
                                                    "enabled":  true
                                                }
                                            ]

Documentation/ObjectInfo/applicationrestrictions_macgeneral.json

@@ -30,7 +30,7 @@
                                                                                                                                                     ],
                                                                                                                                         "entityKey":  "appId",
                                                                                                                                         "booleanActions":  0,
-                                                                                                                                        "policyType":  60,
+                                                                                                                                        "policyType":  61,
                                                                                                                                         "enabled":  true
                                                                                                                                     }
                                                                                                                    },
@@ -48,7 +48,7 @@
                                                                                                                                                     ],
                                                                                                                                         "entityKey":  "name",
                                                                                                                                         "booleanActions":  0,
-                                                                                                                                        "policyType":  60,
+                                                                                                                                        "policyType":  61,
                                                                                                                                         "enabled":  true
                                                                                                                                     }
                                                                                                                    },
@@ -66,7 +66,7 @@
                                                                                                                                                     ],
                                                                                                                                         "entityKey":  "publisher",
                                                                                                                                         "booleanActions":  0,
-                                                                                                                                        "policyType":  60,
+                                                                                                                                        "policyType":  61,
                                                                                                                                         "enabled":  true
                                                                                                                                     }
                                                                                                                    }
@@ -83,7 +83,7 @@
                                                                                                                ],
                                                                                                    "entityKey":  "compliantAppsList",
                                                                                                    "booleanActions":  0,
-                                                                                                   "policyType":  60,
+                                                                                                   "policyType":  61,
                                                                                                    "enabled":  true
                                                                                                }
                                                                                            ],
@@ -108,7 +108,7 @@
                                                                          "booleanActions":  0,
                                                                          "defaultValue":  "none",
                                                                          "unconfiguredValue":  "none",
-                                                                         "policyType":  60,
+                                                                         "policyType":  61,
                                                                          "enabled":  true
                                                                      }
                                                                  ],
@@ -116,7 +116,7 @@
 
                                                            ],
                                                "booleanActions":  0,
-                                               "policyType":  60,
+                                               "policyType":  61,
                                                "enabled":  true
                                            }
 }

Documentation/ObjectInfo/applicationrestrictions_windowsphonegeneral.json

@@ -22,7 +22,7 @@
                                                                                                                                    ],
                                                                                                                        "entityKey":  "appStoreUrl",
                                                                                                                        "booleanActions":  0,
-                                                                                                                       "policyType":  100,
+                                                                                                                       "policyType":  101,
                                                                                                                        "enabled":  true
                                                                                                                    }
                                                                                                   },
@@ -40,7 +40,7 @@
                                                                                                                                    ],
                                                                                                                        "entityKey":  "name",
                                                                                                                        "booleanActions":  0,
-                                                                                                                       "policyType":  100,
+                                                                                                                       "policyType":  101,
                                                                                                                        "enabled":  true
                                                                                                                    }
                                                                                                   },
@@ -58,7 +58,7 @@
                                                                                                                                    ],
                                                                                                                        "entityKey":  "publisher",
                                                                                                                        "booleanActions":  0,
-                                                                                                                       "policyType":  100,
+                                                                                                                       "policyType":  101,
                                                                                                                        "enabled":  true
                                                                                                                    }
                                                                                                   }
@@ -75,7 +75,7 @@
                                                                                               ],
                                                                                   "entityKey":  "compliantAppsList",
                                                                                   "booleanActions":  0,
-                                                                                  "policyType":  100,
+                                                                                  "policyType":  101,
                                                                                   "enabled":  true
                                                                               }
                                                                           ],
@@ -100,7 +100,7 @@
                                                         "booleanActions":  0,
                                                         "defaultValue":  "none",
                                                         "unconfiguredValue":  "none",
-                                                        "policyType":  100,
+                                                        "policyType":  101,
                                                         "enabled":  true
                                                     }
 }

Documentation/ObjectInfo/applications_windows10general.json

@@ -14,7 +14,7 @@
                                               "entityKey":  "windowsStoreBlocked",
                                               "booleanActions":  3,
                                               "defaultValue":  false,
-                                              "policyType":  78,
+                                              "policyType":  79,
                                               "enabled":  true
                                           },
                                           {
@@ -31,7 +31,7 @@
                                               "entityKey":  "windowsStoreBlockAutoUpdate",
                                               "booleanActions":  3,
                                               "defaultValue":  false,
-                                              "policyType":  78,
+                                              "policyType":  79,
                                               "enabled":  true
                                           },
                                           {
@@ -63,7 +63,7 @@
                                               "booleanActions":  0,
                                               "defaultValue":  "notConfigured",
                                               "unconfiguredValue":  "notConfigured",
-                                              "policyType":  78,
+                                              "policyType":  79,
                                               "enabled":  true
                                           },
                                           {
@@ -95,7 +95,7 @@
                                               "booleanActions":  0,
                                               "defaultValue":  "notConfigured",
                                               "unconfiguredValue":  "notConfigured",
-                                              "policyType":  78,
+                                              "policyType":  79,
                                               "enabled":  true
                                           },
                                           {
@@ -112,7 +112,7 @@
                                               "entityKey":  "sharedUserAppDataAllowed",
                                               "booleanActions":  0,
                                               "defaultValue":  false,
-                                              "policyType":  78,
+                                              "policyType":  79,
                                               "enabled":  true
                                           },
                                           {
@@ -129,7 +129,7 @@
                                               "entityKey":  "windowsStoreEnablePrivateStoreOnly",
                                               "booleanActions":  0,
                                               "defaultValue":  false,
-                                              "policyType":  78,
+                                              "policyType":  79,
                                               "enabled":  true
                                           },
                                           {
@@ -146,7 +146,7 @@
                                               "entityKey":  "appsBlockWindowsStoreOriginatedApps",
                                               "booleanActions":  3,
                                               "defaultValue":  false,
-                                              "policyType":  78,
+                                              "policyType":  79,
                                               "enabled":  true
                                           },
                                           {
@@ -163,7 +163,7 @@
                                               "entityKey":  "storageRestrictAppDataToSystemVolume",
                                               "booleanActions":  3,
                                               "defaultValue":  false,
-                                              "policyType":  78,
+                                              "policyType":  79,
                                               "enabled":  true
                                           },
                                           {
@@ -180,7 +180,7 @@
                                               "entityKey":  "storageRestrictAppInstallToSystemVolume",
                                               "booleanActions":  3,
                                               "defaultValue":  false,
-                                              "policyType":  78,
+                                              "policyType":  79,
                                               "enabled":  true
                                           },
                                           {
@@ -197,7 +197,7 @@
                                               "entityKey":  "gameDvrBlocked",
                                               "booleanActions":  3,
                                               "defaultValue":  false,
-                                              "policyType":  78,
+                                              "policyType":  79,
                                               "enabled":  true
                                           },
                                           {
@@ -214,7 +214,7 @@
                                               "entityKey":  "smartScreenEnableAppInstallControl",
                                               "booleanActions":  1,
                                               "defaultValue":  false,
-                                              "policyType":  78,
+                                              "policyType":  79,
                                               "enabled":  false
                                           },
                                           {
@@ -255,7 +255,7 @@
                                               "entityKey":  "smartScreenAppInstallControl",
                                               "booleanActions":  0,
                                               "defaultValue":  "notConfigured",
-                                              "policyType":  78,
+                                              "policyType":  79,
                                               "enabled":  true
                                           },
                                           {
@@ -282,7 +282,7 @@
                                               "booleanActions":  0,
                                               "defaultValue":  false,
                                               "unconfiguredValue":  false,
-                                              "policyType":  78,
+                                              "policyType":  79,
                                               "enabled":  true
                                           },
                                           {
@@ -309,7 +309,7 @@
                                               "booleanActions":  0,
                                               "defaultValue":  false,
                                               "unconfiguredValue":  false,
-                                              "policyType":  78,
+                                              "policyType":  79,
                                               "enabled":  true
                                           },
                                           {
@@ -327,7 +327,7 @@
                                               "entityKey":  "appManagementPackageFamilyNamesToLaunchAfterLogOn",
                                               "booleanActions":  0,
                                               "defaultValue":  "",
-                                              "policyType":  78,
+                                              "policyType":  79,
                                               "enabled":  true
                                           }
                                       ]

Documentation/ObjectInfo/applications_windowsphonegeneral.json

@@ -13,7 +13,7 @@
                                              "entityKey":  "windowsStoreBlocked",
                                              "booleanActions":  3,
                                              "defaultValue":  false,
-                                             "policyType":  100,
+                                             "policyType":  101,
                                              "enabled":  true
                                          }
 }

Documentation/ObjectInfo/applicationsandgames_iosgeneral.json

@@ -27,7 +27,7 @@
                                                                                                     "entityKey":  "contactsAllowUnmanagedToManagedRead",
                                                                                                     "booleanActions":  9,
                                                                                                     "defaultValue":  false,
-                                                                                                    "policyType":  45,
+                                                                                                    "policyType":  46,
                                                                                                     "enabled":  true
                                                                                                 }
                                                                                             ],
@@ -37,7 +37,7 @@
                                                                           "entityKey":  "documentsBlockManagedDocumentsInUnmanagedApps",
                                                                           "booleanActions":  9,
                                                                           "defaultValue":  false,
-                                                                          "policyType":  45,
+                                                                          "policyType":  46,
                                                                           "enabled":  true
                                                                       },
                                                                       {
@@ -54,7 +54,7 @@
                                                                           "entityKey":  "airDropForceUnmanagedDropTarget",
                                                                           "booleanActions":  9,
                                                                           "defaultValue":  false,
-                                                                          "policyType":  45,
+                                                                          "policyType":  46,
                                                                           "enabled":  true
                                                                       },
                                                                       {
@@ -70,7 +70,24 @@
                                                                           "entityKey":  "documentsBlockUnmanagedDocumentsInManagedApps",
                                                                           "booleanActions":  9,
                                                                           "defaultValue":  false,
-                                                                          "policyType":  45,
+                                                                          "policyType":  46,
+                                                                          "enabled":  true
+                                                                      },
+                                                                      {
+                                                                          "dataType":  0,
+                                                                          "category":  7,
+                                                                          "nameResourceKey":  "managedPasteboardRequiredName",
+                                                                          "descriptionResourceKey":  "managedPasteboardRequiredDescription",
+                                                                          "childSettings":  [
+
+                                                                                            ],
+                                                                          "options":  [
+
+                                                                                      ],
+                                                                          "entityKey":  "managedPasteboardRequired",
+                                                                          "booleanActions":  9,
+                                                                          "defaultValue":  false,
+                                                                          "policyType":  46,
                                                                           "enabled":  true
                                                                       }
                                                                   ],
@@ -78,7 +95,7 @@
 
                                                             ],
                                                 "booleanActions":  0,
-                                                "policyType":  45,
+                                                "policyType":  46,
                                                 "enabled":  true
                                             },
                                             {
@@ -103,7 +120,7 @@
                                                                           "entityKey":  "appStoreRequirePassword",
                                                                           "booleanActions":  9,
                                                                           "defaultValue":  false,
-                                                                          "policyType":  45,
+                                                                          "policyType":  46,
                                                                           "enabled":  true
                                                                       },
                                                                       {
@@ -119,7 +136,7 @@
                                                                           "entityKey":  "appStoreBlockInAppPurchases",
                                                                           "booleanActions":  9,
                                                                           "defaultValue":  false,
-                                                                          "policyType":  45,
+                                                                          "policyType":  46,
                                                                           "enabled":  true
                                                                       },
                                                                       {
@@ -136,7 +153,7 @@
                                                                           "entityKey":  "iBooksStoreBlockErotica",
                                                                           "booleanActions":  9,
                                                                           "defaultValue":  false,
-                                                                          "policyType":  45,
+                                                                          "policyType":  46,
                                                                           "enabled":  true
                                                                       },
                                                                       {
@@ -153,7 +170,7 @@
                                                                           "entityKey":  "contactsAllowManagedToUnmanagedWrite",
                                                                           "booleanActions":  9,
                                                                           "defaultValue":  false,
-                                                                          "policyType":  45,
+                                                                          "policyType":  46,
                                                                           "enabled":  true
                                                                       },
                                                                       {
@@ -224,7 +241,7 @@
                                                                                                                                               "entityKey":  "movieRating",
                                                                                                                                               "booleanActions":  0,
                                                                                                                                               "defaultValue":  "allAllowed",
-                                                                                                                                              "policyType":  45,
+                                                                                                                                              "policyType":  46,
                                                                                                                                               "enabled":  true
                                                                                                                                           },
                                                                                                                                           {
@@ -285,7 +302,7 @@
                                                                                                                                               "entityKey":  "tvRating",
                                                                                                                                               "booleanActions":  0,
                                                                                                                                               "defaultValue":  "allAllowed",
-                                                                                                                                              "policyType":  45,
+                                                                                                                                              "policyType":  46,
                                                                                                                                               "enabled":  true
                                                                                                                                           }
                                                                                                                                       ],
@@ -301,7 +318,7 @@
                                                                                                                                ],
                                                                                                                    "entityKey":  "mediaContentRatingAustralia",
                                                                                                                    "booleanActions":  0,
-                                                                                                                   "policyType":  45,
+                                                                                                                   "policyType":  46,
                                                                                                                    "enabled":  true
                                                                                                                },
                                                                                                                {
@@ -348,7 +365,7 @@
                                                                                                                    "booleanActions":  0,
                                                                                                                    "defaultValue":  "allAllowed",
                                                                                                                    "unconfiguredValue":  "allAllowed",
-                                                                                                                   "policyType":  45,
+                                                                                                                   "policyType":  46,
                                                                                                                    "enabled":  true
                                                                                                                }
                                                                                                            ],
@@ -408,7 +425,7 @@
                                                                                                                                               "entityKey":  "movieRating",
                                                                                                                                               "booleanActions":  0,
                                                                                                                                               "defaultValue":  "allAllowed",
-                                                                                                                                              "policyType":  45,
+                                                                                                                                              "policyType":  46,
                                                                                                                                               "enabled":  true
                                                                                                                                           },
                                                                                                                                           {
@@ -464,7 +481,7 @@
                                                                                                                                               "entityKey":  "tvRating",
                                                                                                                                               "booleanActions":  0,
                                                                                                                                               "defaultValue":  "allAllowed",
-                                                                                                                                              "policyType":  45,
+                                                                                                                                              "policyType":  46,
                                                                                                                                               "enabled":  true
                                                                                                                                           }
                                                                                                                                       ],
@@ -480,7 +497,7 @@
                                                                                                                                ],
                                                                                                                    "entityKey":  "mediaContentRatingCanada",
                                                                                                                    "booleanActions":  0,
-                                                                                                                   "policyType":  45,
+                                                                                                                   "policyType":  46,
                                                                                                                    "enabled":  true
                                                                                                                },
                                                                                                                {
@@ -527,7 +544,7 @@
                                                                                                                    "booleanActions":  0,
                                                                                                                    "defaultValue":  "allAllowed",
                                                                                                                    "unconfiguredValue":  "allAllowed",
-                                                                                                                   "policyType":  45,
+                                                                                                                   "policyType":  46,
                                                                                                                    "enabled":  true
                                                                                                                }
                                                                                                            ],
@@ -582,7 +599,7 @@
                                                                                                                                               "entityKey":  "movieRating",
                                                                                                                                               "booleanActions":  0,
                                                                                                                                               "defaultValue":  "allAllowed",
-                                                                                                                                              "policyType":  45,
+                                                                                                                                              "policyType":  46,
                                                                                                                                               "enabled":  true
                                                                                                                                           },
                                                                                                                                           {
@@ -628,7 +645,7 @@
                                                                                                                                               "entityKey":  "tvRating",
                                                                                                                                               "booleanActions":  0,
                                                                                                                                               "defaultValue":  "allAllowed",
-                                                                                                                                              "policyType":  45,
+                                                                                                                                              "policyType":  46,
                                                                                                                                               "enabled":  true
                                                                                                                                           }
                                                                                                                                       ],
@@ -644,7 +661,7 @@
                                                                                                                                ],
                                                                                                                    "entityKey":  "mediaContentRatingFrance",
                                                                                                                    "booleanActions":  0,
-                                                                                                                   "policyType":  45,
+                                                                                                                   "policyType":  46,
                                                                                                                    "enabled":  true
                                                                                                                },
                                                                                                                {
@@ -691,7 +708,7 @@
                                                                                                                    "booleanActions":  0,
                                                                                                                    "defaultValue":  "allAllowed",
                                                                                                                    "unconfiguredValue":  "allAllowed",
-                                                                                                                   "policyType":  45,
+                                                                                                                   "policyType":  46,
                                                                                                                    "enabled":  true
                                                                                                                }
                                                                                                            ],
@@ -751,7 +768,7 @@
                                                                                                                                               "entityKey":  "movieRating",
                                                                                                                                               "booleanActions":  0,
                                                                                                                                               "defaultValue":  "allAllowed",
-                                                                                                                                              "policyType":  45,
+                                                                                                                                              "policyType":  46,
                                                                                                                                               "enabled":  true
                                                                                                                                           },
                                                                                                                                           {
@@ -802,7 +819,7 @@
                                                                                                                                               "entityKey":  "tvRating",
                                                                                                                                               "booleanActions":  0,
                                                                                                                                               "defaultValue":  "allAllowed",
-                                                                                                                                              "policyType":  45,
+                                                                                                                                              "policyType":  46,
                                                                                                                                               "enabled":  true
                                                                                                                                           }
                                                                                                                                       ],
@@ -818,7 +835,7 @@
                                                                                                                                ],
                                                                                                                    "entityKey":  "mediaContentRatingGermany",
                                                                                                                    "booleanActions":  0,
-                                                                                                                   "policyType":  45,
+                                                                                                                   "policyType":  46,
                                                                                                                    "enabled":  true
                                                                                                                },
                                                                                                                {
@@ -865,7 +882,7 @@
                                                                                                                    "booleanActions":  0,
                                                                                                                    "defaultValue":  "allAllowed",
                                                                                                                    "unconfiguredValue":  "allAllowed",
-                                                                                                                   "policyType":  45,
+                                                                                                                   "policyType":  46,
                                                                                                                    "enabled":  true
                                                                                                                }
                                                                                                            ],
@@ -930,7 +947,7 @@
                                                                                                                                               "entityKey":  "movieRating",
                                                                                                                                               "booleanActions":  0,
                                                                                                                                               "defaultValue":  "allAllowed",
-                                                                                                                                              "policyType":  45,
+                                                                                                                                              "policyType":  46,
                                                                                                                                               "enabled":  true
                                                                                                                                           },
                                                                                                                                           {
@@ -981,7 +998,7 @@
                                                                                                                                               "entityKey":  "tvRating",
                                                                                                                                               "booleanActions":  0,
                                                                                                                                               "defaultValue":  "allAllowed",
-                                                                                                                                              "policyType":  45,
+                                                                                                                                              "policyType":  46,
                                                                                                                                               "enabled":  true
                                                                                                                                           }
                                                                                                                                       ],
@@ -997,7 +1014,7 @@
                                                                                                                                ],
                                                                                                                    "entityKey":  "mediaContentRatingIreland",
                                                                                                                    "booleanActions":  0,
-                                                                                                                   "policyType":  45,
+                                                                                                                   "policyType":  46,
                                                                                                                    "enabled":  true
                                                                                                                },
                                                                                                                {
@@ -1044,7 +1061,7 @@
                                                                                                                    "booleanActions":  0,
                                                                                                                    "defaultValue":  "allAllowed",
                                                                                                                    "unconfiguredValue":  "allAllowed",
-                                                                                                                   "policyType":  45,
+                                                                                                                   "policyType":  46,
                                                                                                                    "enabled":  true
                                                                                                                }
                                                                                                            ],
@@ -1099,7 +1116,7 @@
                                                                                                                                               "entityKey":  "movieRating",
                                                                                                                                               "booleanActions":  0,
                                                                                                                                               "defaultValue":  "allAllowed",
-                                                                                                                                              "policyType":  45,
+                                                                                                                                              "policyType":  46,
                                                                                                                                               "enabled":  true
                                                                                                                                           },
                                                                                                                                           {
@@ -1130,7 +1147,7 @@
                                                                                                                                               "entityKey":  "tvRating",
                                                                                                                                               "booleanActions":  0,
                                                                                                                                               "defaultValue":  "allAllowed",
-                                                                                                                                              "policyType":  45,
+                                                                                                                                              "policyType":  46,
                                                                                                                                               "enabled":  true
                                                                                                                                           }
                                                                                                                                       ],
@@ -1146,7 +1163,7 @@
                                                                                                                                ],
                                                                                                                    "entityKey":  "mediaContentRatingJapan",
                                                                                                                    "booleanActions":  0,
-                                                                                                                   "policyType":  45,
+                                                                                                                   "policyType":  46,
                                                                                                                    "enabled":  true
                                                                                                                },
                                                                                                                {
@@ -1193,7 +1210,7 @@
                                                                                                                    "booleanActions":  0,
                                                                                                                    "defaultValue":  "allAllowed",
                                                                                                                    "unconfiguredValue":  "allAllowed",
-                                                                                                                   "policyType":  45,
+                                                                                                                   "policyType":  46,
                                                                                                                    "enabled":  true
                                                                                                                }
                                                                                                            ],
@@ -1273,7 +1290,7 @@
                                                                                                                                               "entityKey":  "movieRating",
                                                                                                                                               "booleanActions":  0,
                                                                                                                                               "defaultValue":  "allAllowed",
-                                                                                                                                              "policyType":  45,
+                                                                                                                                              "policyType":  46,
                                                                                                                                               "enabled":  true
                                                                                                                                           },
                                                                                                                                           {
@@ -1314,7 +1331,7 @@
                                                                                                                                               "entityKey":  "tvRating",
                                                                                                                                               "booleanActions":  0,
                                                                                                                                               "defaultValue":  "allAllowed",
-                                                                                                                                              "policyType":  45,
+                                                                                                                                              "policyType":  46,
                                                                                                                                               "enabled":  true
                                                                                                                                           }
                                                                                                                                       ],
@@ -1330,7 +1347,7 @@
                                                                                                                                ],
                                                                                                                    "entityKey":  "mediaContentRatingNewZealand",
                                                                                                                    "booleanActions":  0,
-                                                                                                                   "policyType":  45,
+                                                                                                                   "policyType":  46,
                                                                                                                    "enabled":  true
                                                                                                                },
                                                                                                                {
@@ -1377,7 +1394,7 @@
                                                                                                                    "booleanActions":  0,
                                                                                                                    "defaultValue":  "allAllowed",
                                                                                                                    "unconfiguredValue":  "allAllowed",
-                                                                                                                   "policyType":  45,
+                                                                                                                   "policyType":  46,
                                                                                                                    "enabled":  true
                                                                                                                }
                                                                                                            ],
@@ -1447,7 +1464,7 @@
                                                                                                                                               "entityKey":  "movieRating",
                                                                                                                                               "booleanActions":  0,
                                                                                                                                               "defaultValue":  "allAllowed",
-                                                                                                                                              "policyType":  45,
+                                                                                                                                              "policyType":  46,
                                                                                                                                               "enabled":  true
                                                                                                                                           },
                                                                                                                                           {
@@ -1478,7 +1495,7 @@
                                                                                                                                               "entityKey":  "tvRating",
                                                                                                                                               "booleanActions":  0,
                                                                                                                                               "defaultValue":  "allAllowed",
-                                                                                                                                              "policyType":  45,
+                                                                                                                                              "policyType":  46,
                                                                                                                                               "enabled":  true
                                                                                                                                           }
                                                                                                                                       ],
@@ -1494,7 +1511,7 @@
                                                                                                                                ],
                                                                                                                    "entityKey":  "mediaContentRatingUnitedKingdom",
                                                                                                                    "booleanActions":  0,
-                                                                                                                   "policyType":  45,
+                                                                                                                   "policyType":  46,
                                                                                                                    "enabled":  true
                                                                                                                },
                                                                                                                {
@@ -1541,7 +1558,7 @@
                                                                                                                    "booleanActions":  0,
                                                                                                                    "defaultValue":  "allAllowed",
                                                                                                                    "unconfiguredValue":  "allAllowed",
-                                                                                                                   "policyType":  45,
+                                                                                                                   "policyType":  46,
                                                                                                                    "enabled":  true
                                                                                                                }
                                                                                                            ],
@@ -1601,7 +1618,7 @@
                                                                                                                                               "entityKey":  "movieRating",
                                                                                                                                               "booleanActions":  0,
                                                                                                                                               "defaultValue":  "allAllowed",
-                                                                                                                                              "policyType":  45,
+                                                                                                                                              "policyType":  46,
                                                                                                                                               "enabled":  true
                                                                                                                                           },
                                                                                                                                           {
@@ -1657,7 +1674,7 @@
                                                                                                                                               "entityKey":  "tvRating",
                                                                                                                                               "booleanActions":  0,
                                                                                                                                               "defaultValue":  "allAllowed",
-                                                                                                                                              "policyType":  45,
+                                                                                                                                              "policyType":  46,
                                                                                                                                               "enabled":  true
                                                                                                                                           }
                                                                                                                                       ],
@@ -1673,7 +1690,7 @@
                                                                                                                                ],
                                                                                                                    "entityKey":  "mediaContentRatingUnitedStates",
                                                                                                                    "booleanActions":  0,
-                                                                                                                   "policyType":  45,
+                                                                                                                   "policyType":  46,
                                                                                                                    "enabled":  true
                                                                                                                },
                                                                                                                {
@@ -1720,7 +1737,7 @@
                                                                                                                    "booleanActions":  0,
                                                                                                                    "defaultValue":  "allAllowed",
                                                                                                                    "unconfiguredValue":  "allAllowed",
-                                                                                                                   "policyType":  45,
+                                                                                                                   "policyType":  46,
                                                                                                                    "enabled":  true
                                                                                                                }
                                                                                                            ],
@@ -1731,7 +1748,7 @@
                                                                           "booleanActions":  0,
                                                                           "defaultValue":  "notConfigured",
                                                                           "unconfiguredValue":  "notConfigured",
-                                                                          "policyType":  45,
+                                                                          "policyType":  46,
                                                                           "enabled":  true
                                                                       }
                                                                   ],
@@ -1739,7 +1756,7 @@
 
                                                             ],
                                                 "booleanActions":  0,
-                                                "policyType":  45,
+                                                "policyType":  46,
                                                 "enabled":  true
                                             },
                                             {
@@ -1770,7 +1787,7 @@
                                                                                                     "entityKey":  "appStoreBlockUIAppInstallation",
                                                                                                     "booleanActions":  9,
                                                                                                     "defaultValue":  false,
-                                                                                                    "policyType":  45,
+                                                                                                    "policyType":  46,
                                                                                                     "enabled":  true
                                                                                                 },
                                                                                                 {
@@ -1787,7 +1804,7 @@
                                                                                                     "entityKey":  "appStoreBlockAutomaticDownloads",
                                                                                                     "booleanActions":  9,
                                                                                                     "defaultValue":  false,
-                                                                                                    "policyType":  45,
+                                                                                                    "policyType":  46,
                                                                                                     "enabled":  true
                                                                                                 }
                                                                                             ],
@@ -1797,7 +1814,7 @@
                                                                           "entityKey":  "appStoreBlocked",
                                                                           "booleanActions":  9,
                                                                           "defaultValue":  false,
-                                                                          "policyType":  45,
+                                                                          "policyType":  46,
                                                                           "enabled":  true
                                                                       },
                                                                       {
@@ -1814,7 +1831,7 @@
                                                                           "entityKey":  "iTunesBlockExplicitContent",
                                                                           "booleanActions":  9,
                                                                           "defaultValue":  false,
-                                                                          "policyType":  45,
+                                                                          "policyType":  46,
                                                                           "enabled":  true
                                                                       },
                                                                       {
@@ -1831,7 +1848,7 @@
                                                                           "entityKey":  "gamingBlockGameCenterFriends",
                                                                           "booleanActions":  9,
                                                                           "defaultValue":  false,
-                                                                          "policyType":  45,
+                                                                          "policyType":  46,
                                                                           "enabled":  true
                                                                       },
                                                                       {
@@ -1847,7 +1864,7 @@
                                                                           "entityKey":  "gameCenterBlocked",
                                                                           "booleanActions":  9,
                                                                           "defaultValue":  false,
-                                                                          "policyType":  45,
+                                                                          "policyType":  46,
                                                                           "enabled":  true
                                                                       },
                                                                       {
@@ -1864,7 +1881,7 @@
                                                                           "entityKey":  "gamingBlockMultiplayer",
                                                                           "booleanActions":  9,
                                                                           "defaultValue":  false,
-                                                                          "policyType":  45,
+                                                                          "policyType":  46,
                                                                           "enabled":  true
                                                                       },
                                                                       {
@@ -1881,7 +1898,7 @@
                                                                           "entityKey":  "filesNetworkDriveAccessBlocked",
                                                                           "booleanActions":  9,
                                                                           "defaultValue":  false,
-                                                                          "policyType":  45,
+                                                                          "policyType":  46,
                                                                           "enabled":  true
                                                                       }
                                                                   ],
@@ -1889,7 +1906,7 @@
 
                                                             ],
                                                 "booleanActions":  0,
-                                                "policyType":  45,
+                                                "policyType":  46,
                                                 "enabled":  true
                                             }
                                         ]

Documentation/ObjectInfo/applicationsandgames_macgeneral.json

@@ -0,0 +1,69 @@
+{
+    "applicationsandgames_macgeneral":  {
+                                            "isSettingDescription":  false,
+                                            "showAsSectionHeader":  true,
+                                            "dataType":  8,
+                                            "category":  7,
+                                            "nameResourceKey":  "automatedDeviceEnrollmentHeaderNameMac",
+                                            "descriptionResourceKey":  "automatedDeviceEnrollmentHeaderDescriptionMac",
+                                            "childSettings":  [
+                                                                  {
+                                                                      "dataType":  0,
+                                                                      "category":  7,
+                                                                      "nameResourceKey":  "addingGameCenterFriendsBlockedMacName",
+                                                                      "descriptionResourceKey":  "addingGameCenterFriendsBlockedMacDescription",
+                                                                      "childSettings":  [
+
+                                                                                        ],
+                                                                      "options":  [
+
+                                                                                  ],
+                                                                      "entityKey":  "addingGameCenterFriendsBlocked",
+                                                                      "booleanActions":  9,
+                                                                      "defaultValue":  false,
+                                                                      "policyType":  61,
+                                                                      "enabled":  true
+                                                                  },
+                                                                  {
+                                                                      "dataType":  0,
+                                                                      "category":  7,
+                                                                      "nameResourceKey":  "gameCenterBlockedMacName",
+                                                                      "descriptionResourceKey":  "gameCenterBlockedMacDescription",
+                                                                      "childSettings":  [
+
+                                                                                        ],
+                                                                      "options":  [
+
+                                                                                  ],
+                                                                      "entityKey":  "gameCenterBlocked",
+                                                                      "booleanActions":  9,
+                                                                      "defaultValue":  false,
+                                                                      "policyType":  61,
+                                                                      "enabled":  true
+                                                                  },
+                                                                  {
+                                                                      "dataType":  0,
+                                                                      "category":  7,
+                                                                      "nameResourceKey":  "multiplayerGamingBlockedMacName",
+                                                                      "descriptionResourceKey":  "multiplayerGamingBlockedMacDescription",
+                                                                      "childSettings":  [
+
+                                                                                        ],
+                                                                      "options":  [
+
+                                                                                  ],
+                                                                      "entityKey":  "multiplayerGamingBlocked",
+                                                                      "booleanActions":  9,
+                                                                      "defaultValue":  false,
+                                                                      "policyType":  61,
+                                                                      "enabled":  true
+                                                                  }
+                                                              ],
+                                            "options":  [
+
+                                                        ],
+                                            "booleanActions":  0,
+                                            "policyType":  61,
+                                            "enabled":  true
+                                        }
+}

Documentation/ObjectInfo/applicationvisibility_iosgeneral.json

@@ -13,7 +13,7 @@
 
                                                              ],
                                                  "booleanActions":  0,
-                                                 "policyType":  45,
+                                                 "policyType":  46,
                                                  "enabled":  true
                                              },
                                              {
@@ -47,7 +47,7 @@
                                                                                                                                                       ],
                                                                                                                                           "entityKey":  "appStoreUrl",
                                                                                                                                           "booleanActions":  0,
-                                                                                                                                          "policyType":  45,
+                                                                                                                                          "policyType":  46,
                                                                                                                                           "enabled":  true
                                                                                                                                       }
                                                                                                                      },
@@ -66,7 +66,7 @@
                                                                                                                                                       ],
                                                                                                                                           "entityKey":  "appId",
                                                                                                                                           "booleanActions":  0,
-                                                                                                                                          "policyType":  45,
+                                                                                                                                          "policyType":  46,
                                                                                                                                           "enabled":  true
                                                                                                                                       }
                                                                                                                      },
@@ -84,7 +84,7 @@
                                                                                                                                                       ],
                                                                                                                                           "entityKey":  "name",
                                                                                                                                           "booleanActions":  0,
-                                                                                                                                          "policyType":  45,
+                                                                                                                                          "policyType":  46,
                                                                                                                                           "enabled":  true
                                                                                                                                       }
                                                                                                                      },
@@ -102,7 +102,7 @@
                                                                                                                                                       ],
                                                                                                                                           "entityKey":  "publisher",
                                                                                                                                           "booleanActions":  0,
-                                                                                                                                          "policyType":  45,
+                                                                                                                                          "policyType":  46,
                                                                                                                                           "enabled":  true
                                                                                                                                       }
                                                                                                                      }
@@ -119,7 +119,7 @@
                                                                                                                  ],
                                                                                                      "entityKey":  "appsVisibilityList",
                                                                                                      "booleanActions":  0,
-                                                                                                     "policyType":  45,
+                                                                                                     "policyType":  46,
                                                                                                      "enabled":  true
                                                                                                  }
                                                                                              ],
@@ -144,7 +144,7 @@
                                                                            "booleanActions":  0,
                                                                            "defaultValue":  "none",
                                                                            "unconfiguredValue":  "none",
-                                                                           "policyType":  45,
+                                                                           "policyType":  46,
                                                                            "enabled":  true
                                                                        }
                                                                    ],
@@ -152,7 +152,7 @@
 
                                                              ],
                                                  "booleanActions":  0,
-                                                 "policyType":  45,
+                                                 "policyType":  46,
                                                  "enabled":  true
                                              }
                                          ]

Documentation/ObjectInfo/appsandexperience_windows10teamgeneral.json

@@ -14,7 +14,7 @@
                                                        "entityKey":  "welcomeScreenBlockAutomaticWakeUp",
                                                        "booleanActions":  3,
                                                        "defaultValue":  false,
-                                                       "policyType":  86,
+                                                       "policyType":  87,
                                                        "enabled":  true
                                                    },
                                                    {
@@ -46,7 +46,7 @@
                                                        "booleanActions":  0,
                                                        "defaultValue":  "userDefined",
                                                        "unconfiguredValue":  "userDefined",
-                                                       "policyType":  86,
+                                                       "policyType":  87,
                                                        "enabled":  true
                                                    },
                                                    {
@@ -63,7 +63,7 @@
                                                                    ],
                                                        "entityKey":  "welcomeScreenBackgroundImageUrl",
                                                        "booleanActions":  0,
-                                                       "policyType":  86,
+                                                       "policyType":  87,
                                                        "enabled":  true
                                                    },
                                                    {
@@ -80,7 +80,7 @@
                                                        "entityKey":  "connectAppBlockAutoLaunch",
                                                        "booleanActions":  3,
                                                        "defaultValue":  false,
-                                                       "policyType":  86,
+                                                       "policyType":  87,
                                                        "enabled":  true
                                                    },
                                                    {
@@ -97,7 +97,7 @@
                                                        "entityKey":  "settingsBlockSigninSuggestions",
                                                        "booleanActions":  3,
                                                        "defaultValue":  false,
-                                                       "policyType":  86,
+                                                       "policyType":  87,
                                                        "enabled":  true
                                                    },
                                                    {
@@ -114,7 +114,7 @@
                                                        "entityKey":  "settingsBlockMyMeetingsAndFiles",
                                                        "booleanActions":  3,
                                                        "defaultValue":  false,
-                                                       "policyType":  86,
+                                                       "policyType":  87,
                                                        "enabled":  true
                                                    }
                                                ]

Documentation/ObjectInfo/associateddomains_macdevicefeatures.json

@@ -13,7 +13,7 @@
 
                                                                 ],
                                                     "booleanActions":  0,
-                                                    "policyType":  57,
+                                                    "policyType":  58,
                                                     "enabled":  true
                                                 },
                                                 {
@@ -41,7 +41,7 @@
                                                                                                                                ],
                                                                                                                    "entityKey":  "applicationIdentifier",
                                                                                                                    "booleanActions":  0,
-                                                                                                                   "policyType":  57,
+                                                                                                                   "policyType":  58,
                                                                                                                    "enabled":  true
                                                                                                                }
                                                                                               },
@@ -62,7 +62,7 @@
                                                                                                                                                                     ],
                                                                                                                                                         "entityKey":  "domains",
                                                                                                                                                         "booleanActions":  0,
-                                                                                                                                                        "policyType":  57,
+                                                                                                                                                        "policyType":  58,
                                                                                                                                                         "enabled":  true
                                                                                                                                                     }
                                                                                                                                    }
@@ -79,7 +79,7 @@
                                                                                                                                ],
                                                                                                                    "entityKey":  "domains",
                                                                                                                    "booleanActions":  0,
-                                                                                                                   "policyType":  57,
+                                                                                                                   "policyType":  58,
                                                                                                                    "enabled":  true
                                                                                                                }
                                                                                               },
@@ -98,7 +98,7 @@
                                                                                                                    "entityKey":  "directDownloadsEnabled",
                                                                                                                    "booleanActions":  9,
                                                                                                                    "defaultValue":  false,
-                                                                                                                   "policyType":  57,
+                                                                                                                   "policyType":  58,
                                                                                                                    "enabled":  true
                                                                                                                }
                                                                                               }
@@ -115,7 +115,7 @@
                                                                                           ],
                                                                               "entityKey":  "appAssociatedDomains",
                                                                               "booleanActions":  0,
-                                                                              "policyType":  57,
+                                                                              "policyType":  58,
                                                                               "enabled":  true
                                                                           }
                                                                       ],
@@ -123,7 +123,7 @@
 
                                                                 ],
                                                     "booleanActions":  0,
-                                                    "policyType":  57,
+                                                    "policyType":  58,
                                                     "enabled":  true
                                                 }
                                             ]

Documentation/ObjectInfo/autonomoussingleappmode_iosgeneral.json

@@ -13,7 +13,7 @@
 
                                                                ],
                                                    "booleanActions":  0,
-                                                   "policyType":  45,
+                                                   "policyType":  46,
                                                    "enabled":  true
                                                },
                                                {
@@ -40,7 +40,7 @@
                                                                                                                               ],
                                                                                                                   "entityKey":  "name",
                                                                                                                   "booleanActions":  0,
-                                                                                                                  "policyType":  45,
+                                                                                                                  "policyType":  46,
                                                                                                                   "enabled":  true
                                                                                                               }
                                                                                              },
@@ -58,7 +58,7 @@
                                                                                                                               ],
                                                                                                                   "entityKey":  "appId",
                                                                                                                   "booleanActions":  0,
-                                                                                                                  "policyType":  45,
+                                                                                                                  "policyType":  46,
                                                                                                                   "enabled":  true
                                                                                                               }
                                                                                              }
@@ -75,7 +75,7 @@
                                                                                          ],
                                                                              "entityKey":  "appsSingleAppModeList",
                                                                              "booleanActions":  0,
-                                                                             "policyType":  45,
+                                                                             "policyType":  46,
                                                                              "enabled":  true
                                                                          }
                                                                      ],
@@ -83,7 +83,7 @@
 
                                                                ],
                                                    "booleanActions":  0,
-                                                   "policyType":  45,
+                                                   "policyType":  46,
                                                    "enabled":  true
                                                }
                                            ]

Documentation/ObjectInfo/azureoperationalinsights_windows10teamgeneral.json

@@ -18,7 +18,7 @@
                                                                                                 ],
                                                                                     "entityKey":  "azureOperationalInsightsWorkspaceId",
                                                                                     "booleanActions":  0,
-                                                                                    "policyType":  86,
+                                                                                    "policyType":  87,
                                                                                     "enabled":  true
                                                                                 },
                                                                                 {
@@ -34,7 +34,7 @@
                                                                                                 ],
                                                                                     "entityKey":  "azureOperationalInsightsWorkspaceKey",
                                                                                     "booleanActions":  0,
-                                                                                    "policyType":  86,
+                                                                                    "policyType":  87,
                                                                                     "enabled":  true
                                                                                 }
                                                                             ],
@@ -44,7 +44,7 @@
                                                           "entityKey":  "syntheticAzureOperationalInsightsEnabled",
                                                           "booleanActions":  2,
                                                           "defaultValue":  false,
-                                                          "policyType":  86,
+                                                          "policyType":  87,
                                                           "enabled":  true
                                                       }
 }

Documentation/ObjectInfo/bitlocker_windows10endpointprotection.json

@@ -14,7 +14,7 @@
 
                                                                   ],
                                                       "booleanActions":  0,
-                                                      "policyType":  76,
+                                                      "policyType":  77,
                                                       "enabled":  true
                                                   },
                                                   {
@@ -32,7 +32,7 @@
                                                       "booleanActions":  1,
                                                       "defaultValue":  false,
                                                       "unconfiguredValue":  false,
-                                                      "policyType":  76,
+                                                      "policyType":  77,
                                                       "enabled":  true
                                                   },
                                                   {
@@ -50,7 +50,7 @@
                                                       "booleanActions":  1,
                                                       "defaultValue":  false,
                                                       "unconfiguredValue":  false,
-                                                      "policyType":  76,
+                                                      "policyType":  77,
                                                       "enabled":  true
                                                   },
                                                   {
@@ -67,7 +67,7 @@
 
                                                                   ],
                                                       "booleanActions":  0,
-                                                      "policyType":  76,
+                                                      "policyType":  77,
                                                       "enabled":  true
                                                   },
                                                   {
@@ -100,7 +100,7 @@
                                                                                 "booleanActions":  0,
                                                                                 "defaultValue":  false,
                                                                                 "unconfiguredValue":  false,
-                                                                                "policyType":  76,
+                                                                                "policyType":  77,
                                                                                 "enabled":  true
                                                                             }
                                                                         ],
@@ -111,7 +111,7 @@
                                                       "booleanActions":  3,
                                                       "defaultValue":  false,
                                                       "unconfiguredValue":  false,
-                                                      "policyType":  76,
+                                                      "policyType":  77,
                                                       "enabled":  true
                                                   },
                                                   {
@@ -144,7 +144,7 @@
 
                                                                                                                                      ],
                                                                                                                          "booleanActions":  0,
-                                                                                                                         "policyType":  76,
+                                                                                                                         "policyType":  77,
                                                                                                                          "enabled":  true
                                                                                                                      }
                                                                                                                  ],
@@ -165,7 +165,7 @@
 
                                                                                                                                      ],
                                                                                                                          "booleanActions":  0,
-                                                                                                                         "policyType":  76,
+                                                                                                                         "policyType":  77,
                                                                                                                          "enabled":  true
                                                                                                                      }
                                                                                                                  ],
@@ -191,7 +191,7 @@
 
                                                                                                                                      ],
                                                                                                                          "booleanActions":  0,
-                                                                                                                         "policyType":  76,
+                                                                                                                         "policyType":  77,
                                                                                                                          "enabled":  true
                                                                                                                      }
                                                                                                                  ],
@@ -202,7 +202,7 @@
                                                                                 "booleanActions":  0,
                                                                                 "defaultValue":  "xtsAes128",
                                                                                 "unconfiguredValue":  "xtsAes128",
-                                                                                "policyType":  76,
+                                                                                "policyType":  77,
                                                                                 "enabled":  true
                                                                             },
                                                                             {
@@ -229,7 +229,7 @@
 
                                                                                                                                      ],
                                                                                                                          "booleanActions":  0,
-                                                                                                                         "policyType":  76,
+                                                                                                                         "policyType":  77,
                                                                                                                          "enabled":  true
                                                                                                                      }
                                                                                                                  ],
@@ -250,7 +250,7 @@
 
                                                                                                                                      ],
                                                                                                                          "booleanActions":  0,
-                                                                                                                         "policyType":  76,
+                                                                                                                         "policyType":  77,
                                                                                                                          "enabled":  true
                                                                                                                      }
                                                                                                                  ],
@@ -276,7 +276,7 @@
 
                                                                                                                                      ],
                                                                                                                          "booleanActions":  0,
-                                                                                                                         "policyType":  76,
+                                                                                                                         "policyType":  77,
                                                                                                                          "enabled":  true
                                                                                                                      }
                                                                                                                  ],
@@ -287,7 +287,7 @@
                                                                                 "booleanActions":  0,
                                                                                 "defaultValue":  "xtsAes128",
                                                                                 "unconfiguredValue":  "xtsAes128",
-                                                                                "policyType":  76,
+                                                                                "policyType":  77,
                                                                                 "enabled":  true
                                                                             },
                                                                             {
@@ -319,7 +319,7 @@
 
                                                                                                                                      ],
                                                                                                                          "booleanActions":  0,
-                                                                                                                         "policyType":  76,
+                                                                                                                         "policyType":  77,
                                                                                                                          "enabled":  true
                                                                                                                      }
                                                                                                                  ],
@@ -340,7 +340,7 @@
 
                                                                                                                                      ],
                                                                                                                          "booleanActions":  0,
-                                                                                                                         "policyType":  76,
+                                                                                                                         "policyType":  77,
                                                                                                                          "enabled":  true
                                                                                                                      }
                                                                                                                  ],
@@ -361,7 +361,7 @@
 
                                                                                                                                      ],
                                                                                                                          "booleanActions":  0,
-                                                                                                                         "policyType":  76,
+                                                                                                                         "policyType":  77,
                                                                                                                          "enabled":  true
                                                                                                                      }
                                                                                                                  ],
@@ -372,7 +372,7 @@
                                                                                 "booleanActions":  0,
                                                                                 "defaultValue":  "aesCbc128",
                                                                                 "unconfiguredValue":  "aesCbc128",
-                                                                                "policyType":  76,
+                                                                                "policyType":  77,
                                                                                 "enabled":  true
                                                                             }
                                                                         ],
@@ -383,7 +383,7 @@
                                                       "booleanActions":  2,
                                                       "defaultValue":  false,
                                                       "unconfiguredValue":  false,
-                                                      "policyType":  76,
+                                                      "policyType":  77,
                                                       "enabled":  true
                                                   },
                                                   {
@@ -400,7 +400,7 @@
 
                                                                   ],
                                                       "booleanActions":  0,
-                                                      "policyType":  76,
+                                                      "policyType":  77,
                                                       "enabled":  true
                                                   },
                                                   {
@@ -424,7 +424,7 @@
                                                                                 "booleanActions":  3,
                                                                                 "defaultValue":  false,
                                                                                 "unconfiguredValue":  false,
-                                                                                "policyType":  76,
+                                                                                "policyType":  77,
                                                                                 "enabled":  true
                                                                             },
                                                                             {
@@ -456,7 +456,7 @@
                                                                                 "booleanActions":  0,
                                                                                 "defaultValue":  "allowed",
                                                                                 "unconfiguredValue":  "allowed",
-                                                                                "policyType":  76,
+                                                                                "policyType":  77,
                                                                                 "enabled":  true
                                                                             },
                                                                             {
@@ -488,7 +488,7 @@
                                                                                 "booleanActions":  0,
                                                                                 "defaultValue":  "allowed",
                                                                                 "unconfiguredValue":  "allowed",
-                                                                                "policyType":  76,
+                                                                                "policyType":  77,
                                                                                 "enabled":  true
                                                                             },
                                                                             {
@@ -520,7 +520,7 @@
                                                                                 "booleanActions":  0,
                                                                                 "defaultValue":  "allowed",
                                                                                 "unconfiguredValue":  "allowed",
-                                                                                "policyType":  76,
+                                                                                "policyType":  77,
                                                                                 "enabled":  true
                                                                             },
                                                                             {
@@ -552,7 +552,7 @@
                                                                                 "booleanActions":  0,
                                                                                 "defaultValue":  "allowed",
                                                                                 "unconfiguredValue":  "allowed",
-                                                                                "policyType":  76,
+                                                                                "policyType":  77,
                                                                                 "enabled":  true
                                                                             },
                                                                             {
@@ -574,7 +574,7 @@
                                                                                                                       ],
                                                                                                           "entityKey":  "minimumPinLength",
                                                                                                           "booleanActions":  0,
-                                                                                                          "policyType":  76,
+                                                                                                          "policyType":  77,
                                                                                                           "enabled":  true
                                                                                                       }
                                                                                                   ],
@@ -585,7 +585,7 @@
                                                                                 "booleanActions":  2,
                                                                                 "defaultValue":  false,
                                                                                 "unconfiguredValue":  false,
-                                                                                "policyType":  76,
+                                                                                "policyType":  77,
                                                                                 "enabled":  true
                                                                             },
                                                                             {
@@ -609,7 +609,7 @@
                                                                                                           "booleanActions":  3,
                                                                                                           "defaultValue":  false,
                                                                                                           "unconfiguredValue":  false,
-                                                                                                          "policyType":  76,
+                                                                                                          "policyType":  77,
                                                                                                           "enabled":  true
                                                                                                       },
                                                                                                       {
@@ -641,7 +641,7 @@
                                                                                                           "booleanActions":  0,
                                                                                                           "defaultValue":  "allowed",
                                                                                                           "unconfiguredValue":  "allowed",
-                                                                                                          "policyType":  76,
+                                                                                                          "policyType":  77,
                                                                                                           "enabled":  true
                                                                                                       },
                                                                                                       {
@@ -673,7 +673,7 @@
                                                                                                           "booleanActions":  0,
                                                                                                           "defaultValue":  "allowed",
                                                                                                           "unconfiguredValue":  "allowed",
-                                                                                                          "policyType":  76,
+                                                                                                          "policyType":  77,
                                                                                                           "enabled":  true
                                                                                                       },
                                                                                                       {
@@ -691,7 +691,7 @@
                                                                                                           "booleanActions":  3,
                                                                                                           "defaultValue":  false,
                                                                                                           "unconfiguredValue":  false,
-                                                                                                          "policyType":  76,
+                                                                                                          "policyType":  77,
                                                                                                           "enabled":  true
                                                                                                       },
                                                                                                       {
@@ -709,7 +709,7 @@
                                                                                                           "booleanActions":  2,
                                                                                                           "defaultValue":  false,
                                                                                                           "unconfiguredValue":  false,
-                                                                                                          "policyType":  76,
+                                                                                                          "policyType":  77,
                                                                                                           "enabled":  true
                                                                                                       },
                                                                                                       {
@@ -736,7 +736,7 @@
                                                                                                           "booleanActions":  0,
                                                                                                           "defaultValue":  "passwordAndKey",
                                                                                                           "unconfiguredValue":  "passwordAndKey",
-                                                                                                          "policyType":  76,
+                                                                                                          "policyType":  77,
                                                                                                           "enabled":  true
                                                                                                       },
                                                                                                       {
@@ -773,7 +773,7 @@
                                                                                                           "booleanActions":  0,
                                                                                                           "defaultValue":  "notConfigured",
                                                                                                           "unconfiguredValue":  "notConfigured",
-                                                                                                          "policyType":  76,
+                                                                                                          "policyType":  77,
                                                                                                           "enabled":  true
                                                                                                       },
                                                                                                       {
@@ -791,7 +791,7 @@
                                                                                                           "booleanActions":  1,
                                                                                                           "defaultValue":  false,
                                                                                                           "unconfiguredValue":  false,
-                                                                                                          "policyType":  76,
+                                                                                                          "policyType":  77,
                                                                                                           "enabled":  true
                                                                                                       }
                                                                                                   ],
@@ -802,7 +802,7 @@
                                                                                 "booleanActions":  2,
                                                                                 "defaultValue":  false,
                                                                                 "unconfiguredValue":  false,
-                                                                                "policyType":  76,
+                                                                                "policyType":  77,
                                                                                 "enabled":  true
                                                                             },
                                                                             {
@@ -847,7 +847,7 @@
                                                                                                                                                                ],
                                                                                                                                                    "entityKey":  "prebootRecoveryMessage",
                                                                                                                                                    "booleanActions":  0,
-                                                                                                                                                   "policyType":  76,
+                                                                                                                                                   "policyType":  77,
                                                                                                                                                    "enabled":  true
                                                                                                                                                }
                                                                                                                                            ],
@@ -870,7 +870,7 @@
                                                                                                                                                                ],
                                                                                                                                                    "entityKey":  "prebootRecoveryUrl",
                                                                                                                                                    "booleanActions":  0,
-                                                                                                                                                   "policyType":  76,
+                                                                                                                                                   "policyType":  77,
                                                                                                                                                    "enabled":  true
                                                                                                                                                }
                                                                                                                                            ],
@@ -881,7 +881,7 @@
                                                                                                           "booleanActions":  0,
                                                                                                           "defaultValue":  "default",
                                                                                                           "unconfiguredValue":  "default",
-                                                                                                          "policyType":  76,
+                                                                                                          "policyType":  77,
                                                                                                           "enabled":  true
                                                                                                       }
                                                                                                   ],
@@ -892,7 +892,7 @@
                                                                                 "booleanActions":  2,
                                                                                 "defaultValue":  false,
                                                                                 "unconfiguredValue":  false,
-                                                                                "policyType":  76,
+                                                                                "policyType":  77,
                                                                                 "enabled":  true
                                                                             }
                                                                         ],
@@ -903,7 +903,7 @@
                                                       "booleanActions":  1,
                                                       "defaultValue":  false,
                                                       "unconfiguredValue":  false,
-                                                      "policyType":  76,
+                                                      "policyType":  77,
                                                       "enabled":  true
                                                   },
                                                   {
@@ -920,7 +920,7 @@
 
                                                                   ],
                                                       "booleanActions":  0,
-                                                      "policyType":  76,
+                                                      "policyType":  77,
                                                       "enabled":  true
                                                   },
                                                   {
@@ -938,7 +938,7 @@
                                                       "booleanActions":  3,
                                                       "defaultValue":  false,
                                                       "unconfiguredValue":  false,
-                                                      "policyType":  76,
+                                                      "policyType":  77,
                                                       "enabled":  true
                                                   },
                                                   {
@@ -962,7 +962,7 @@
                                                                                 "booleanActions":  3,
                                                                                 "defaultValue":  false,
                                                                                 "unconfiguredValue":  false,
-                                                                                "policyType":  76,
+                                                                                "policyType":  77,
                                                                                 "enabled":  true
                                                                             },
                                                                             {
@@ -994,7 +994,7 @@
                                                                                 "booleanActions":  0,
                                                                                 "defaultValue":  "allowed",
                                                                                 "unconfiguredValue":  "allowed",
-                                                                                "policyType":  76,
+                                                                                "policyType":  77,
                                                                                 "enabled":  true
                                                                             },
                                                                             {
@@ -1026,7 +1026,7 @@
                                                                                 "booleanActions":  0,
                                                                                 "defaultValue":  "allowed",
                                                                                 "unconfiguredValue":  "allowed",
-                                                                                "policyType":  76,
+                                                                                "policyType":  77,
                                                                                 "enabled":  true
                                                                             },
                                                                             {
@@ -1044,7 +1044,7 @@
                                                                                 "booleanActions":  3,
                                                                                 "defaultValue":  false,
                                                                                 "unconfiguredValue":  false,
-                                                                                "policyType":  76,
+                                                                                "policyType":  77,
                                                                                 "enabled":  true
                                                                             },
                                                                             {
@@ -1062,7 +1062,7 @@
                                                                                 "booleanActions":  2,
                                                                                 "defaultValue":  false,
                                                                                 "unconfiguredValue":  false,
-                                                                                "policyType":  76,
+                                                                                "policyType":  77,
                                                                                 "enabled":  true
                                                                             },
                                                                             {
@@ -1089,7 +1089,7 @@
                                                                                 "booleanActions":  0,
                                                                                 "defaultValue":  "passwordAndKey",
                                                                                 "unconfiguredValue":  "passwordAndKey",
-                                                                                "policyType":  76,
+                                                                                "policyType":  77,
                                                                                 "enabled":  true
                                                                             },
                                                                             {
@@ -1107,7 +1107,7 @@
                                                                                 "booleanActions":  1,
                                                                                 "defaultValue":  false,
                                                                                 "unconfiguredValue":  false,
-                                                                                "policyType":  76,
+                                                                                "policyType":  77,
                                                                                 "enabled":  true
                                                                             }
                                                                         ],
@@ -1118,7 +1118,7 @@
                                                       "booleanActions":  2,
                                                       "defaultValue":  false,
                                                       "unconfiguredValue":  false,
-                                                      "policyType":  76,
+                                                      "policyType":  77,
                                                       "enabled":  true
                                                   },
                                                   {
@@ -1135,7 +1135,7 @@
 
                                                                   ],
                                                       "booleanActions":  0,
-                                                      "policyType":  76,
+                                                      "policyType":  77,
                                                       "enabled":  true
                                                   },
                                                   {
@@ -1159,7 +1159,7 @@
                                                                                 "booleanActions":  3,
                                                                                 "defaultValue":  false,
                                                                                 "unconfiguredValue":  false,
-                                                                                "policyType":  76,
+                                                                                "policyType":  77,
                                                                                 "enabled":  true
                                                                             }
                                                                         ],
@@ -1170,7 +1170,7 @@
                                                       "booleanActions":  3,
                                                       "defaultValue":  false,
                                                       "unconfiguredValue":  false,
-                                                      "policyType":  76,
+                                                      "policyType":  77,
                                                       "enabled":  true
                                                   }
                                               ]

Documentation/ObjectInfo/browser_windows8general.json

@@ -14,7 +14,7 @@
                                         "entityKey":  "browserBlockAutofill",
                                         "booleanActions":  3,
                                         "defaultValue":  false,
-                                        "policyType":  91,
+                                        "policyType":  92,
                                         "enabled":  true
                                     },
                                     {
@@ -31,7 +31,7 @@
                                         "entityKey":  "browserRequireFraudWarning",
                                         "booleanActions":  1,
                                         "defaultValue":  false,
-                                        "policyType":  91,
+                                        "policyType":  92,
                                         "enabled":  true
                                     },
                                     {
@@ -48,7 +48,7 @@
                                         "entityKey":  "browserRequireSmartScreen",
                                         "booleanActions":  3,
                                         "defaultValue":  false,
-                                        "policyType":  91,
+                                        "policyType":  92,
                                         "enabled":  true
                                     },
                                     {
@@ -65,7 +65,7 @@
                                         "entityKey":  "browserBlockJavaScript",
                                         "booleanActions":  3,
                                         "defaultValue":  false,
-                                        "policyType":  91,
+                                        "policyType":  92,
                                         "enabled":  true
                                     },
                                     {
@@ -82,7 +82,7 @@
                                         "entityKey":  "browserBlockPopups",
                                         "booleanActions":  3,
                                         "defaultValue":  false,
-                                        "policyType":  91,
+                                        "policyType":  92,
                                         "enabled":  true
                                     },
                                     {
@@ -99,7 +99,7 @@
                                         "entityKey":  "browserBlockSendingDoNotTrackHeader",
                                         "booleanActions":  3,
                                         "defaultValue":  false,
-                                        "policyType":  91,
+                                        "policyType":  92,
                                         "enabled":  true
                                     },
                                     {
@@ -116,7 +116,7 @@
                                         "entityKey":  "browserBlockPlugins",
                                         "booleanActions":  3,
                                         "defaultValue":  false,
-                                        "policyType":  91,
+                                        "policyType":  92,
                                         "enabled":  true
                                     },
                                     {
@@ -133,7 +133,7 @@
                                         "entityKey":  "browserBlockSingleWordEntryOnIntranetSites",
                                         "booleanActions":  3,
                                         "defaultValue":  false,
-                                        "policyType":  91,
+                                        "policyType":  92,
                                         "enabled":  true
                                     },
                                     {
@@ -150,7 +150,7 @@
                                         "entityKey":  "browserBlockAutomaticDetectionOfIntranetSites",
                                         "booleanActions":  3,
                                         "defaultValue":  false,
-                                        "policyType":  91,
+                                        "policyType":  92,
                                         "enabled":  true
                                     },
                                     {
@@ -187,7 +187,7 @@
                                         "booleanActions":  0,
                                         "defaultValue":  "userDefined",
                                         "unconfiguredValue":  "userDefined",
-                                        "policyType":  91,
+                                        "policyType":  92,
                                         "enabled":  true
                                     },
                                     {
@@ -234,7 +234,7 @@
                                         "booleanActions":  0,
                                         "defaultValue":  "userDefined",
                                         "unconfiguredValue":  "userDefined",
-                                        "policyType":  91,
+                                        "policyType":  92,
                                         "enabled":  true
                                     },
                                     {
@@ -281,7 +281,7 @@
                                         "booleanActions":  0,
                                         "defaultValue":  "userDefined",
                                         "unconfiguredValue":  "userDefined",
-                                        "policyType":  91,
+                                        "policyType":  92,
                                         "enabled":  true
                                     },
                                     {
@@ -298,7 +298,7 @@
                                         "entityKey":  "browserRequireHighSecurityForRestrictedSites",
                                         "booleanActions":  4,
                                         "defaultValue":  false,
-                                        "policyType":  91,
+                                        "policyType":  92,
                                         "enabled":  true
                                     },
                                     {
@@ -321,7 +321,7 @@
                                                                               ],
                                                                   "entityKey":  "browserLoggingReportLocation",
                                                                   "booleanActions":  0,
-                                                                  "policyType":  91,
+                                                                  "policyType":  92,
                                                                   "enabled":  true
                                                               }
                                                           ],
@@ -331,7 +331,7 @@
                                         "entityKey":  "browserBlockEnterpriseModeAccess",
                                         "booleanActions":  3,
                                         "defaultValue":  false,
-                                        "policyType":  91,
+                                        "policyType":  92,
                                         "enabled":  true
                                     },
                                     {
@@ -348,7 +348,7 @@
                                                     ],
                                         "entityKey":  "browserEnterpriseModeSiteListLocation",
                                         "booleanActions":  0,
-                                        "policyType":  91,
+                                        "policyType":  92,
                                         "enabled":  true
                                     }
                                 ]

Documentation/ObjectInfo/browser_windowsphonegeneral.json

@@ -13,7 +13,7 @@
                                         "entityKey":  "webBrowserBlocked",
                                         "booleanActions":  3,
                                         "defaultValue":  false,
-                                        "policyType":  100,
+                                        "policyType":  101,
                                         "enabled":  true
                                     }
 }

Documentation/ObjectInfo/builtinapps_iosgeneral.json

@@ -26,7 +26,7 @@
                                                                                            "entityKey":  "siriBlockedWhenLocked",
                                                                                            "booleanActions":  9,
                                                                                            "defaultValue":  false,
-                                                                                           "policyType":  45,
+                                                                                           "policyType":  46,
                                                                                            "enabled":  true
                                                                                        }
                                                                                    ],
@@ -36,7 +36,7 @@
                                                                  "entityKey":  "siriBlocked",
                                                                  "booleanActions":  9,
                                                                  "defaultValue":  false,
-                                                                 "policyType":  45,
+                                                                 "policyType":  46,
                                                                  "enabled":  true
                                                              },
                                                              {
@@ -52,7 +52,7 @@
                                                                  "entityKey":  "safariRequireFraudWarning",
                                                                  "booleanActions":  9,
                                                                  "defaultValue":  false,
-                                                                 "policyType":  45,
+                                                                 "policyType":  46,
                                                                  "enabled":  true
                                                              }
                                                          ],
@@ -60,7 +60,7 @@
 
                                                    ],
                                        "booleanActions":  0,
-                                       "policyType":  45,
+                                       "policyType":  46,
                                        "enabled":  true
                                    },
                                    {
@@ -85,7 +85,7 @@
                                                                  "entityKey":  "spotlightBlockInternetResults",
                                                                  "booleanActions":  9,
                                                                  "defaultValue":  false,
-                                                                 "policyType":  45,
+                                                                 "policyType":  46,
                                                                  "enabled":  true
                                                              },
                                                              {
@@ -103,22 +103,17 @@
                                                                                      "enabled":  true
                                                                                  },
                                                                                  {
-                                                                                     "nameResourceKey":  "allowOption",
+                                                                                     "nameResourceKey":  "webBrowserCookiesAllowAll",
                                                                                      "value":  "allowAlways",
                                                                                      "enabled":  true
                                                                                  },
                                                                                  {
-                                                                                     "nameResourceKey":  "blockAllCookiesOption",
+                                                                                     "nameResourceKey":  "webBrowserCookiesPreventAndBlock",
                                                                                      "value":  "blockAlways",
                                                                                      "enabled":  true
                                                                                  },
                                                                                  {
-                                                                                     "nameResourceKey":  "allowVisitedSitesCookiesOption",
+                                                                                     "nameResourceKey":  "webBrowserCookiesPreventCrossSite",
-                                                                                     "value":  "allowFromWebsitesVisited",
-                                                                                     "enabled":  true
-                                                                                 },
-                                                                                 {
-                                                                                     "nameResourceKey":  "allowCurrentWebSiteCookiesOption",
                                                                                      "value":  "allowCurrentWebSite",
                                                                                      "enabled":  true
                                                                                  }
@@ -127,7 +122,7 @@
                                                                  "booleanActions":  0,
                                                                  "defaultValue":  "browserDefault",
                                                                  "unconfiguredValue":  "browserDefault",
-                                                                 "policyType":  45,
+                                                                 "policyType":  46,
                                                                  "enabled":  true
                                                              },
                                                              {
@@ -143,7 +138,7 @@
                                                                  "entityKey":  "safariBlockJavaScript",
                                                                  "booleanActions":  9,
                                                                  "defaultValue":  false,
-                                                                 "policyType":  45,
+                                                                 "policyType":  46,
                                                                  "enabled":  true
                                                              },
                                                              {
@@ -159,7 +154,41 @@
                                                                  "entityKey":  "safariBlockPopups",
                                                                  "booleanActions":  9,
                                                                  "defaultValue":  false,
-                                                                 "policyType":  45,
+                                                                 "policyType":  46,
+                                                                 "enabled":  true
+                                                             },
+                                                             {
+                                                                 "dataType":  0,
+                                                                 "category":  16,
+                                                                 "nameResourceKey":  "onDeviceOnlyDictationForcedName",
+                                                                 "descriptionResourceKey":  "onDeviceOnlyDictationForcedDescription",
+                                                                 "childSettings":  [
+
+                                                                                   ],
+                                                                 "options":  [
+
+                                                                             ],
+                                                                 "entityKey":  "onDeviceOnlyDictationForced",
+                                                                 "booleanActions":  9,
+                                                                 "defaultValue":  false,
+                                                                 "policyType":  46,
+                                                                 "enabled":  true
+                                                             },
+                                                             {
+                                                                 "dataType":  0,
+                                                                 "category":  16,
+                                                                 "nameResourceKey":  "onDeviceOnlyTranslationForcedName",
+                                                                 "descriptionResourceKey":  "onDeviceOnlyTranslationForcedDescription",
+                                                                 "childSettings":  [
+
+                                                                                   ],
+                                                                 "options":  [
+
+                                                                             ],
+                                                                 "entityKey":  "onDeviceOnlyTranslationForced",
+                                                                 "booleanActions":  9,
+                                                                 "defaultValue":  false,
+                                                                 "policyType":  46,
                                                                  "enabled":  true
                                                              }
                                                          ],
@@ -167,7 +196,7 @@
 
                                                    ],
                                        "booleanActions":  0,
-                                       "policyType":  45,
+                                       "policyType":  46,
                                        "enabled":  true
                                    },
                                    {
@@ -196,7 +225,7 @@
                                                                                            "entityKey":  "faceTimeBlocked",
                                                                                            "booleanActions":  9,
                                                                                            "defaultValue":  false,
-                                                                                           "policyType":  45,
+                                                                                           "policyType":  46,
                                                                                            "enabled":  true
                                                                                        }
                                                                                    ],
@@ -206,7 +235,7 @@
                                                                  "entityKey":  "cameraBlocked",
                                                                  "booleanActions":  9,
                                                                  "defaultValue":  false,
-                                                                 "policyType":  45,
+                                                                 "policyType":  46,
                                                                  "enabled":  true
                                                              },
                                                              {
@@ -223,7 +252,7 @@
                                                                  "entityKey":  "siriRequireProfanityFilter",
                                                                  "booleanActions":  9,
                                                                  "defaultValue":  false,
-                                                                 "policyType":  45,
+                                                                 "policyType":  46,
                                                                  "enabled":  true
                                                              },
                                                              {
@@ -240,7 +269,7 @@
                                                                  "entityKey":  "siriBlockUserGeneratedContent",
                                                                  "booleanActions":  9,
                                                                  "defaultValue":  false,
-                                                                 "policyType":  45,
+                                                                 "policyType":  46,
                                                                  "enabled":  true
                                                              },
                                                              {
@@ -256,7 +285,7 @@
                                                                  "entityKey":  "appleNewsBlocked",
                                                                  "booleanActions":  9,
                                                                  "defaultValue":  false,
-                                                                 "policyType":  45,
+                                                                 "policyType":  46,
                                                                  "enabled":  true
                                                              },
                                                              {
@@ -272,7 +301,7 @@
                                                                  "entityKey":  "iBooksStoreBlocked",
                                                                  "booleanActions":  9,
                                                                  "defaultValue":  false,
-                                                                 "policyType":  45,
+                                                                 "policyType":  46,
                                                                  "enabled":  true
                                                              },
                                                              {
@@ -288,7 +317,7 @@
                                                                  "entityKey":  "messagesBlocked",
                                                                  "booleanActions":  9,
                                                                  "defaultValue":  false,
-                                                                 "policyType":  45,
+                                                                 "policyType":  46,
                                                                  "enabled":  true
                                                              },
                                                              {
@@ -304,7 +333,7 @@
                                                                  "entityKey":  "podcastsBlocked",
                                                                  "booleanActions":  9,
                                                                  "defaultValue":  false,
-                                                                 "policyType":  45,
+                                                                 "policyType":  46,
                                                                  "enabled":  true
                                                              },
                                                              {
@@ -321,7 +350,7 @@
                                                                  "entityKey":  "iTunesBlockMusicService",
                                                                  "booleanActions":  9,
                                                                  "defaultValue":  false,
-                                                                 "policyType":  45,
+                                                                 "policyType":  46,
                                                                  "enabled":  true
                                                              },
                                                              {
@@ -337,7 +366,7 @@
                                                                  "entityKey":  "iTunesBlockRadio",
                                                                  "booleanActions":  9,
                                                                  "defaultValue":  false,
-                                                                 "policyType":  45,
+                                                                 "policyType":  46,
                                                                  "enabled":  true
                                                              },
                                                              {
@@ -353,7 +382,7 @@
                                                                  "entityKey":  "iTunesBlocked",
                                                                  "booleanActions":  9,
                                                                  "defaultValue":  false,
-                                                                 "policyType":  45,
+                                                                 "policyType":  46,
                                                                  "enabled":  true
                                                              },
                                                              {
@@ -370,7 +399,7 @@
                                                                  "entityKey":  "findMyDeviceInFindMyAppBlocked",
                                                                  "booleanActions":  9,
                                                                  "defaultValue":  false,
-                                                                 "policyType":  45,
+                                                                 "policyType":  46,
                                                                  "enabled":  true
                                                              },
                                                              {
@@ -387,7 +416,7 @@
                                                                  "entityKey":  "findMyFriendsInFindMyAppBlocked",
                                                                  "booleanActions":  9,
                                                                  "defaultValue":  false,
-                                                                 "policyType":  45,
+                                                                 "policyType":  46,
                                                                  "enabled":  true
                                                              },
                                                              {
@@ -404,7 +433,7 @@
                                                                  "entityKey":  "findMyFriendsBlocked",
                                                                  "booleanActions":  9,
                                                                  "defaultValue":  false,
-                                                                 "policyType":  45,
+                                                                 "policyType":  46,
                                                                  "enabled":  true
                                                              },
                                                              {
@@ -421,7 +450,7 @@
                                                                  "entityKey":  "blockSystemAppRemoval",
                                                                  "booleanActions":  9,
                                                                  "defaultValue":  false,
-                                                                 "policyType":  45,
+                                                                 "policyType":  46,
                                                                  "enabled":  true
                                                              },
                                                              {
@@ -438,7 +467,7 @@
                                                                  "entityKey":  "safariBlocked",
                                                                  "booleanActions":  9,
                                                                  "defaultValue":  false,
-                                                                 "policyType":  45,
+                                                                 "policyType":  46,
                                                                  "enabled":  true
                                                              },
                                                              {
@@ -454,7 +483,7 @@
                                                                  "entityKey":  "safariBlockAutofill",
                                                                  "booleanActions":  9,
                                                                  "defaultValue":  false,
-                                                                 "policyType":  45,
+                                                                 "policyType":  46,
                                                                  "enabled":  true
                                                              }
                                                          ],
@@ -462,7 +491,7 @@
 
                                                    ],
                                        "booleanActions":  0,
-                                       "policyType":  45,
+                                       "policyType":  46,
                                        "enabled":  true
                                    }
                                ]

Documentation/ObjectInfo/builtinapps_macgeneral.json

@@ -21,7 +21,7 @@
                                                              "entityKey":  "safariBlockAutofill",
                                                              "booleanActions":  9,
                                                              "defaultValue":  false,
-                                                             "policyType":  60,
+                                                             "policyType":  61,
                                                              "enabled":  true
                                                          },
                                                          {
@@ -38,7 +38,7 @@
                                                              "entityKey":  "cameraBlocked",
                                                              "booleanActions":  9,
                                                              "defaultValue":  false,
-                                                             "policyType":  60,
+                                                             "policyType":  61,
                                                              "enabled":  true
                                                          },
                                                          {
@@ -54,7 +54,7 @@
                                                              "entityKey":  "iTunesBlockMusicService",
                                                              "booleanActions":  9,
                                                              "defaultValue":  false,
-                                                             "policyType":  60,
+                                                             "policyType":  61,
                                                              "enabled":  true
                                                          },
                                                          {
@@ -71,7 +71,7 @@
                                                              "entityKey":  "spotlightBlockInternetResults",
                                                              "booleanActions":  9,
                                                              "defaultValue":  false,
-                                                             "policyType":  60,
+                                                             "policyType":  61,
                                                              "enabled":  true
                                                          },
                                                          {
@@ -88,7 +88,7 @@
                                                              "entityKey":  "iTunesBlockFileSharing",
                                                              "booleanActions":  9,
                                                              "defaultValue":  false,
-                                                             "policyType":  60,
+                                                             "policyType":  61,
                                                              "enabled":  true
                                                          }
                                                      ],
@@ -96,7 +96,7 @@
 
                                                ],
                                    "booleanActions":  0,
-                                   "policyType":  60,
+                                   "policyType":  61,
                                    "enabled":  true
                                }
 }

Documentation/ObjectInfo/cellular_windows8general.json

@@ -13,7 +13,7 @@
                                      "entityKey":  "cellularBlockDataRoaming",
                                      "booleanActions":  3,
                                      "defaultValue":  false,
-                                     "policyType":  91,
+                                     "policyType":  92,
                                      "enabled":  true
                                  }
 }

Documentation/ObjectInfo/cloudandstorage_iosgeneral.json

@@ -22,7 +22,7 @@
                                                                      "entityKey":  "iCloudRequireEncryptedBackup",
                                                                      "booleanActions":  9,
                                                                      "defaultValue":  false,
-                                                                     "policyType":  45,
+                                                                     "policyType":  46,
                                                                      "enabled":  true
                                                                  },
                                                                  {
@@ -39,7 +39,7 @@
                                                                      "entityKey":  "iCloudBlockManagedAppsSync",
                                                                      "booleanActions":  9,
                                                                      "defaultValue":  false,
-                                                                     "policyType":  45,
+                                                                     "policyType":  46,
                                                                      "enabled":  true
                                                                  },
                                                                  {
@@ -55,7 +55,7 @@
                                                                      "entityKey":  "enterpriseBookBlockBackup",
                                                                      "booleanActions":  9,
                                                                      "defaultValue":  false,
-                                                                     "policyType":  45,
+                                                                     "policyType":  46,
                                                                      "enabled":  true
                                                                  },
                                                                  {
@@ -71,7 +71,7 @@
                                                                      "entityKey":  "enterpriseBookBlockMetadataSync",
                                                                      "booleanActions":  9,
                                                                      "defaultValue":  false,
-                                                                     "policyType":  45,
+                                                                     "policyType":  46,
                                                                      "enabled":  true
                                                                  }
                                                              ],
@@ -79,7 +79,7 @@
 
                                                        ],
                                            "booleanActions":  0,
-                                           "policyType":  45,
+                                           "policyType":  46,
                                            "enabled":  true
                                        },
                                        {
@@ -104,7 +104,7 @@
                                                                      "entityKey":  "iCloudBlockPhotoStreamSync",
                                                                      "booleanActions":  9,
                                                                      "defaultValue":  false,
-                                                                     "policyType":  45,
+                                                                     "policyType":  46,
                                                                      "enabled":  true
                                                                  },
                                                                  {
@@ -121,7 +121,7 @@
                                                                      "entityKey":  "iCloudBlockPhotoLibrary",
                                                                      "booleanActions":  9,
                                                                      "defaultValue":  false,
-                                                                     "policyType":  45,
+                                                                     "policyType":  46,
                                                                      "enabled":  true
                                                                  },
                                                                  {
@@ -138,7 +138,7 @@
                                                                      "entityKey":  "iCloudBlockSharedPhotoStream",
                                                                      "booleanActions":  9,
                                                                      "defaultValue":  false,
-                                                                     "policyType":  45,
+                                                                     "policyType":  46,
                                                                      "enabled":  true
                                                                  },
                                                                  {
@@ -155,7 +155,7 @@
                                                                      "entityKey":  "iCloudBlockActivityContinuation",
                                                                      "booleanActions":  9,
                                                                      "defaultValue":  false,
-                                                                     "policyType":  45,
+                                                                     "policyType":  46,
                                                                      "enabled":  true
                                                                  }
                                                              ],
@@ -163,7 +163,7 @@
 
                                                        ],
                                            "booleanActions":  0,
-                                           "policyType":  45,
+                                           "policyType":  46,
                                            "enabled":  true
                                        },
                                        {
@@ -188,7 +188,7 @@
                                                                      "entityKey":  "iCloudBlockBackup",
                                                                      "booleanActions":  9,
                                                                      "defaultValue":  false,
-                                                                     "policyType":  45,
+                                                                     "policyType":  46,
                                                                      "enabled":  true
                                                                  },
                                                                  {
@@ -205,7 +205,7 @@
                                                                      "entityKey":  "iCloudBlockDocumentSync",
                                                                      "booleanActions":  9,
                                                                      "defaultValue":  false,
-                                                                     "policyType":  45,
+                                                                     "policyType":  46,
                                                                      "enabled":  true
                                                                  },
                                                                  {
@@ -222,7 +222,24 @@
                                                                      "entityKey":  "keychainBlockCloudSync",
                                                                      "booleanActions":  9,
                                                                      "defaultValue":  false,
-                                                                     "policyType":  45,
+                                                                     "policyType":  46,
+                                                                     "enabled":  true
+                                                                 },
+                                                                 {
+                                                                     "dataType":  0,
+                                                                     "category":  18,
+                                                                     "nameResourceKey":  "blockIosICloudPrivateRelayName",
+                                                                     "descriptionResourceKey":  "blockIosICloudPrivateRelayDescription",
+                                                                     "childSettings":  [
+
+                                                                                       ],
+                                                                     "options":  [
+
+                                                                                 ],
+                                                                     "entityKey":  "iCloudPrivateRelayBlocked",
+                                                                     "booleanActions":  9,
+                                                                     "defaultValue":  false,
+                                                                     "policyType":  46,
                                                                      "enabled":  true
                                                                  }
                                                              ],
@@ -230,7 +247,7 @@
 
                                                        ],
                                            "booleanActions":  0,
-                                           "policyType":  45,
+                                           "policyType":  46,
                                            "enabled":  true
                                        }
                                    ]

Documentation/ObjectInfo/cloudandstorage_macgeneral.json

@@ -1,188 +1,240 @@
 {
-    "cloudandstorage_macgeneral":  {
+    "cloudandstorage_macgeneral":  [
-                                       "isSettingDescription":  false,
+                                       {
-                                       "showAsSectionHeader":  true,
+                                           "isSettingDescription":  false,
-                                       "dataType":  8,
+                                           "showAsSectionHeader":  true,
-                                       "category":  18,
+                                           "dataType":  8,
-                                       "nameResourceKey":  "allEnrollmentTypesHeaderNameMac",
+                                           "category":  18,
-                                       "descriptionResourceKey":  "allEnrollmentTypesHeaderDescriptionMac",
+                                           "nameResourceKey":  "allEnrollmentTypesHeaderNameMac",
-                                       "childSettings":  [
+                                           "descriptionResourceKey":  "allEnrollmentTypesHeaderDescriptionMac",
-                                                             {
+                                           "childSettings":  [
-                                                                 "dataType":  0,
+                                                                 {
-                                                                 "category":  18,
+                                                                     "dataType":  0,
-                                                                 "nameResourceKey":  "blockKeychainCloudSyncName",
+                                                                     "category":  18,
-                                                                 "descriptionResourceKey":  "blockKeychainCloudSyncDescription",
+                                                                     "nameResourceKey":  "blockKeychainCloudSyncName",
-                                                                 "childSettings":  [
+                                                                     "descriptionResourceKey":  "blockKeychainCloudSyncDescription",
+                                                                     "childSettings":  [
 
-                                                                                   ],
+                                                                                       ],
-                                                                 "options":  [
+                                                                     "options":  [
 
-                                                                             ],
+                                                                                 ],
-                                                                 "entityKey":  "keychainBlockCloudSync",
+                                                                     "entityKey":  "keychainBlockCloudSync",
-                                                                 "booleanActions":  9,
+                                                                     "booleanActions":  9,
-                                                                 "defaultValue":  false,
+                                                                     "defaultValue":  false,
-                                                                 "policyType":  60,
+                                                                     "policyType":  61,
-                                                                 "enabled":  true
+                                                                     "enabled":  true
-                                                             },
+                                                                 },
-                                                             {
+                                                                 {
-                                                                 "dataType":  0,
+                                                                     "dataType":  0,
-                                                                 "category":  18,
+                                                                     "category":  18,
-                                                                 "nameResourceKey":  "blockICloudDocumentSyncName",
+                                                                     "nameResourceKey":  "blockICloudDesktopAndDocumentsName",
-                                                                 "descriptionResourceKey":  "blockICloudDocumentSyncDescription",
+                                                                     "descriptionResourceKey":  "blockICloudDesktopAndDocumentsDescription",
-                                                                 "childSettings":  [
+                                                                     "childSettings":  [
 
-                                                                                   ],
+                                                                                       ],
-                                                                 "options":  [
+                                                                     "options":  [
 
-                                                                             ],
+                                                                                 ],
-                                                                 "entityKey":  "iCloudBlockDocumentSync",
+                                                                     "entityKey":  "iCloudDesktopAndDocumentsBlocked",
-                                                                 "booleanActions":  9,
+                                                                     "booleanActions":  9,
-                                                                 "defaultValue":  false,
+                                                                     "defaultValue":  false,
-                                                                 "policyType":  60,
+                                                                     "policyType":  61,
-                                                                 "enabled":  true
+                                                                     "enabled":  true
-                                                             },
+                                                                 },
-                                                             {
+                                                                 {
-                                                                 "dataType":  0,
+                                                                     "dataType":  0,
-                                                                 "category":  18,
+                                                                     "category":  18,
-                                                                 "nameResourceKey":  "blockICloudMailName",
+                                                                     "nameResourceKey":  "blockICloudDocumentSyncName",
-                                                                 "descriptionResourceKey":  "blockICloudMailDescription",
+                                                                     "descriptionResourceKey":  "blockICloudDocumentSyncDescription",
-                                                                 "childSettings":  [
+                                                                     "childSettings":  [
 
-                                                                                   ],
+                                                                                       ],
-                                                                 "options":  [
+                                                                     "options":  [
 
-                                                                             ],
+                                                                                 ],
-                                                                 "entityKey":  "iCloudBlockMail",
+                                                                     "entityKey":  "iCloudBlockDocumentSync",
-                                                                 "booleanActions":  9,
+                                                                     "booleanActions":  9,
-                                                                 "defaultValue":  false,
+                                                                     "defaultValue":  false,
-                                                                 "policyType":  60,
+                                                                     "policyType":  61,
-                                                                 "enabled":  true
+                                                                     "enabled":  true
-                                                             },
+                                                                 },
-                                                             {
+                                                                 {
-                                                                 "dataType":  0,
+                                                                     "dataType":  0,
-                                                                 "category":  18,
+                                                                     "category":  18,
-                                                                 "nameResourceKey":  "blockICloudAddressBookName",
+                                                                     "nameResourceKey":  "blockICloudMailName",
-                                                                 "descriptionResourceKey":  "blockICloudAddressBookDescription",
+                                                                     "descriptionResourceKey":  "blockICloudMailDescription",
-                                                                 "childSettings":  [
+                                                                     "childSettings":  [
 
-                                                                                   ],
+                                                                                       ],
-                                                                 "options":  [
+                                                                     "options":  [
 
-                                                                             ],
+                                                                                 ],
-                                                                 "entityKey":  "iCloudBlockAddressBook",
+                                                                     "entityKey":  "iCloudBlockMail",
-                                                                 "booleanActions":  9,
+                                                                     "booleanActions":  9,
-                                                                 "defaultValue":  false,
+                                                                     "defaultValue":  false,
-                                                                 "policyType":  60,
+                                                                     "policyType":  61,
-                                                                 "enabled":  true
+                                                                     "enabled":  true
-                                                             },
+                                                                 },
-                                                             {
+                                                                 {
-                                                                 "dataType":  0,
+                                                                     "dataType":  0,
-                                                                 "category":  18,
+                                                                     "category":  18,
-                                                                 "nameResourceKey":  "blockICloudCalendarName",
+                                                                     "nameResourceKey":  "blockICloudAddressBookName",
-                                                                 "descriptionResourceKey":  "blockICloudCalendarDescription",
+                                                                     "descriptionResourceKey":  "blockICloudAddressBookDescription",
-                                                                 "childSettings":  [
+                                                                     "childSettings":  [
 
-                                                                                   ],
+                                                                                       ],
-                                                                 "options":  [
+                                                                     "options":  [
 
-                                                                             ],
+                                                                                 ],
-                                                                 "entityKey":  "iCloudBlockCalendar",
+                                                                     "entityKey":  "iCloudBlockAddressBook",
-                                                                 "booleanActions":  9,
+                                                                     "booleanActions":  9,
-                                                                 "defaultValue":  false,
+                                                                     "defaultValue":  false,
-                                                                 "policyType":  60,
+                                                                     "policyType":  61,
-                                                                 "enabled":  true
+                                                                     "enabled":  true
-                                                             },
+                                                                 },
-                                                             {
+                                                                 {
-                                                                 "dataType":  0,
+                                                                     "dataType":  0,
-                                                                 "category":  18,
+                                                                     "category":  18,
-                                                                 "nameResourceKey":  "blockICloudRemindersName",
+                                                                     "nameResourceKey":  "blockICloudCalendarName",
-                                                                 "descriptionResourceKey":  "blockICloudRemindersDescription",
+                                                                     "descriptionResourceKey":  "blockICloudCalendarDescription",
-                                                                 "childSettings":  [
+                                                                     "childSettings":  [
 
-                                                                                   ],
+                                                                                       ],
-                                                                 "options":  [
+                                                                     "options":  [
 
-                                                                             ],
+                                                                                 ],
-                                                                 "entityKey":  "iCloudBlockReminders",
+                                                                     "entityKey":  "iCloudBlockCalendar",
-                                                                 "booleanActions":  9,
+                                                                     "booleanActions":  9,
-                                                                 "defaultValue":  false,
+                                                                     "defaultValue":  false,
-                                                                 "policyType":  60,
+                                                                     "policyType":  61,
-                                                                 "enabled":  true
+                                                                     "enabled":  true
-                                                             },
+                                                                 },
-                                                             {
+                                                                 {
-                                                                 "dataType":  0,
+                                                                     "dataType":  0,
-                                                                 "category":  18,
+                                                                     "category":  18,
-                                                                 "nameResourceKey":  "blockICloudBookmarksName",
+                                                                     "nameResourceKey":  "blockICloudRemindersName",
-                                                                 "descriptionResourceKey":  "blockICloudBookmarksDescription",
+                                                                     "descriptionResourceKey":  "blockICloudRemindersDescription",
-                                                                 "childSettings":  [
+                                                                     "childSettings":  [
 
-                                                                                   ],
+                                                                                       ],
-                                                                 "options":  [
+                                                                     "options":  [
 
-                                                                             ],
+                                                                                 ],
-                                                                 "entityKey":  "iCloudBlockBookmarks",
+                                                                     "entityKey":  "iCloudBlockReminders",
-                                                                 "booleanActions":  9,
+                                                                     "booleanActions":  9,
-                                                                 "defaultValue":  false,
+                                                                     "defaultValue":  false,
-                                                                 "policyType":  60,
+                                                                     "policyType":  61,
-                                                                 "enabled":  true
+                                                                     "enabled":  true
-                                                             },
+                                                                 },
-                                                             {
+                                                                 {
-                                                                 "dataType":  0,
+                                                                     "dataType":  0,
-                                                                 "category":  18,
+                                                                     "category":  18,
-                                                                 "nameResourceKey":  "blockICloudNotesName",
+                                                                     "nameResourceKey":  "blockICloudBookmarksName",
-                                                                 "descriptionResourceKey":  "blockICloudNotesDescription",
+                                                                     "descriptionResourceKey":  "blockICloudBookmarksDescription",
-                                                                 "childSettings":  [
+                                                                     "childSettings":  [
 
-                                                                                   ],
+                                                                                       ],
-                                                                 "options":  [
+                                                                     "options":  [
 
-                                                                             ],
+                                                                                 ],
-                                                                 "entityKey":  "iCloudBlockNotes",
+                                                                     "entityKey":  "iCloudBlockBookmarks",
-                                                                 "booleanActions":  9,
+                                                                     "booleanActions":  9,
-                                                                 "defaultValue":  false,
+                                                                     "defaultValue":  false,
-                                                                 "policyType":  60,
+                                                                     "policyType":  61,
-                                                                 "enabled":  true
+                                                                     "enabled":  true
-                                                             },
+                                                                 },
-                                                             {
+                                                                 {
-                                                                 "dataType":  0,
+                                                                     "dataType":  0,
-                                                                 "category":  18,
+                                                                     "category":  18,
-                                                                 "nameResourceKey":  "MacBlockICloudPhotoLibraryName",
+                                                                     "nameResourceKey":  "blockICloudNotesName",
-                                                                 "descriptionResourceKey":  "blockICloudPhotoLibraryDescription",
+                                                                     "descriptionResourceKey":  "blockICloudNotesDescription",
-                                                                 "childSettings":  [
+                                                                     "childSettings":  [
 
-                                                                                   ],
+                                                                                       ],
-                                                                 "options":  [
+                                                                     "options":  [
 
-                                                                             ],
+                                                                                 ],
-                                                                 "entityKey":  "iCloudBlockPhotoLibrary",
+                                                                     "entityKey":  "iCloudBlockNotes",
-                                                                 "booleanActions":  9,
+                                                                     "booleanActions":  9,
-                                                                 "defaultValue":  false,
+                                                                     "defaultValue":  false,
-                                                                 "policyType":  60,
+                                                                     "policyType":  61,
-                                                                 "enabled":  true
+                                                                     "enabled":  true
-                                                             },
+                                                                 },
-                                                             {
+                                                                 {
-                                                                 "dataType":  0,
+                                                                     "dataType":  0,
-                                                                 "category":  18,
+                                                                     "category":  18,
-                                                                 "nameResourceKey":  "blockMacActivityContinuationName",
+                                                                     "nameResourceKey":  "MacBlockICloudPhotoLibraryName",
-                                                                 "descriptionResourceKey":  "blockMacActivityContinuationDescription",
+                                                                     "descriptionResourceKey":  "blockICloudPhotoLibraryDescription",
-                                                                 "childSettings":  [
+                                                                     "childSettings":  [
 
-                                                                                   ],
+                                                                                       ],
-                                                                 "options":  [
+                                                                     "options":  [
 
-                                                                             ],
+                                                                                 ],
-                                                                 "entityKey":  "iCloudBlockActivityContinuation",
+                                                                     "entityKey":  "iCloudBlockPhotoLibrary",
-                                                                 "booleanActions":  9,
+                                                                     "booleanActions":  9,
-                                                                 "defaultValue":  false,
+                                                                     "defaultValue":  false,
-                                                                 "policyType":  60,
+                                                                     "policyType":  61,
-                                                                 "enabled":  true
+                                                                     "enabled":  true
-                                                             }
+                                                                 },
-                                                         ],
+                                                                 {
-                                       "options":  [
+                                                                     "dataType":  0,
+                                                                     "category":  18,
+                                                                     "nameResourceKey":  "blockMacActivityContinuationName",
+                                                                     "descriptionResourceKey":  "blockMacActivityContinuationDescription",
+                                                                     "childSettings":  [
 
-                                                   ],
+                                                                                       ],
-                                       "booleanActions":  0,
+                                                                     "options":  [
-                                       "policyType":  60,
+
-                                       "enabled":  true
+                                                                                 ],
-                                   }
+                                                                     "entityKey":  "iCloudBlockActivityContinuation",
+                                                                     "booleanActions":  9,
+                                                                     "defaultValue":  false,
+                                                                     "policyType":  61,
+                                                                     "enabled":  true
+                                                                 }
+                                                             ],
+                                           "options":  [
+
+                                                       ],
+                                           "booleanActions":  0,
+                                           "policyType":  61,
+                                           "enabled":  true
+                                       },
+                                       {
+                                           "isSettingDescription":  false,
+                                           "showAsSectionHeader":  true,
+                                           "dataType":  8,
+                                           "category":  18,
+                                           "nameResourceKey":  "userApprovedAndAutomatedDeviceEnrollmentHeaderNameMac",
+                                           "descriptionResourceKey":  "userApprovedAndAutomatedDeviceEnrollmentHeaderDescriptionMac",
+                                           "childSettings":  [
+                                                                 {
+                                                                     "dataType":  0,
+                                                                     "category":  18,
+                                                                     "nameResourceKey":  "blockMacICloudPrivateRelayName",
+                                                                     "descriptionResourceKey":  "blockMacICloudPrivateRelayDescription",
+                                                                     "childSettings":  [
+
+                                                                                       ],
+                                                                     "options":  [
+
+                                                                                 ],
+                                                                     "entityKey":  "iCloudPrivateRelayBlocked",
+                                                                     "booleanActions":  9,
+                                                                     "defaultValue":  false,
+                                                                     "policyType":  61,
+                                                                     "enabled":  true
+                                                                 }
+                                                             ],
+                                           "options":  [
+
+                                                       ],
+                                           "booleanActions":  0,
+                                           "policyType":  61,
+                                           "enabled":  true
+                                       }
+                                   ]
 }

Documentation/ObjectInfo/cloudandstorage_windows10general.json

@@ -14,7 +14,7 @@
                                                  "entityKey":  "microsoftAccountBlocked",
                                                  "booleanActions":  3,
                                                  "defaultValue":  false,
-                                                 "policyType":  78,
+                                                 "policyType":  79,
                                                  "enabled":  true
                                              },
                                              {
@@ -31,7 +31,7 @@
                                                  "entityKey":  "accountsBlockAddingNonMicrosoftAccountEmail",
                                                  "booleanActions":  3,
                                                  "defaultValue":  false,
-                                                 "policyType":  78,
+                                                 "policyType":  79,
                                                  "enabled":  true
                                              },
                                              {
@@ -48,7 +48,7 @@
                                                  "entityKey":  "microsoftAccountBlockSettingsSync",
                                                  "booleanActions":  3,
                                                  "defaultValue":  false,
-                                                 "policyType":  78,
+                                                 "policyType":  79,
                                                  "enabled":  true
                                              },
                                              {
@@ -75,7 +75,7 @@
                                                  "booleanActions":  0,
                                                  "defaultValue":  "notConfigured",
                                                  "unconfiguredValue":  "notConfigured",
-                                                 "policyType":  78,
+                                                 "policyType":  79,
                                                  "enabled":  true
                                              }
                                          ]

Documentation/ObjectInfo/cloudandstorage_windows8general.json

@@ -13,7 +13,7 @@
                                                             ],
                                                 "entityKey":  "workFoldersUrl",
                                                 "booleanActions":  0,
-                                                "policyType":  91,
+                                                "policyType":  92,
                                                 "enabled":  true
                                             },
                                             {
@@ -30,7 +30,7 @@
                                                 "entityKey":  "accountsBlockAddingNonMicrosoftAccountEmail",
                                                 "booleanActions":  3,
                                                 "defaultValue":  false,
-                                                "policyType":  91,
+                                                "policyType":  92,
                                                 "enabled":  true
                                             }
                                         ]

Documentation/ObjectInfo/cloudprint_windows10general.json

@@ -16,7 +16,7 @@
                                             "booleanActions":  0,
                                             "defaultValue":  "",
                                             "unconfiguredValue":  "",
-                                            "policyType":  78,
+                                            "policyType":  79,
                                             "enabled":  true
                                         },
                                         {
@@ -35,7 +35,7 @@
                                             "booleanActions":  0,
                                             "defaultValue":  "",
                                             "unconfiguredValue":  "",
-                                            "policyType":  78,
+                                            "policyType":  79,
                                             "enabled":  true
                                         },
                                         {
@@ -54,7 +54,7 @@
                                             "booleanActions":  0,
                                             "defaultValue":  "",
                                             "unconfiguredValue":  "",
-                                            "policyType":  78,
+                                            "policyType":  79,
                                             "enabled":  true
                                         },
                                         {
@@ -73,7 +73,7 @@
                                             "booleanActions":  0,
                                             "defaultValue":  "",
                                             "unconfiguredValue":  "",
-                                            "policyType":  78,
+                                            "policyType":  79,
                                             "enabled":  true
                                         },
                                         {
@@ -90,7 +90,7 @@
                                                         ],
                                             "entityKey":  "enterpriseCloudPrintDiscoveryMaxLimit",
                                             "booleanActions":  0,
-                                            "policyType":  78,
+                                            "policyType":  79,
                                             "enabled":  true
                                         },
                                         {
@@ -109,7 +109,7 @@
                                             "booleanActions":  0,
                                             "defaultValue":  "",
                                             "unconfiguredValue":  "",
-                                            "policyType":  78,
+                                            "policyType":  79,
                                             "enabled":  true
                                         }
                                     ]

Documentation/ObjectInfo/connecteddevices_iosgeneral.json

@@ -22,7 +22,7 @@
                                                                       "entityKey":  "appleWatchForceWristDetection",
                                                                       "booleanActions":  9,
                                                                       "defaultValue":  false,
-                                                                      "policyType":  45,
+                                                                      "policyType":  46,
                                                                       "enabled":  true
                                                                   }
                                                               ],
@@ -30,7 +30,7 @@
 
                                                         ],
                                             "booleanActions":  0,
-                                            "policyType":  45,
+                                            "policyType":  46,
                                             "enabled":  true
                                         },
                                         {
@@ -55,7 +55,24 @@
                                                                       "entityKey":  "airPlayForcePairingPasswordForOutgoingRequests",
                                                                       "booleanActions":  9,
                                                                       "defaultValue":  false,
-                                                                      "policyType":  45,
+                                                                      "policyType":  46,
+                                                                      "enabled":  true
+                                                                  },
+                                                                  {
+                                                                      "dataType":  0,
+                                                                      "category":  20,
+                                                                      "nameResourceKey":  "autoUnlockBlockedName",
+                                                                      "descriptionResourceKey":  "autoUnlockBlockedDescription",
+                                                                      "childSettings":  [
+
+                                                                                        ],
+                                                                      "options":  [
+
+                                                                                  ],
+                                                                      "entityKey":  "autoUnlockBlocked",
+                                                                      "booleanActions":  9,
+                                                                      "defaultValue":  false,
+                                                                      "policyType":  46,
                                                                       "enabled":  true
                                                                   }
                                                               ],
@@ -63,7 +80,7 @@
 
                                                         ],
                                             "booleanActions":  0,
-                                            "policyType":  45,
+                                            "policyType":  46,
                                             "enabled":  true
                                         },
                                         {
@@ -87,7 +104,7 @@
                                                                       "entityKey":  "airDropBlocked",
                                                                       "booleanActions":  9,
                                                                       "defaultValue":  false,
-                                                                      "policyType":  45,
+                                                                      "policyType":  46,
                                                                       "enabled":  true
                                                                   },
                                                                   {
@@ -103,7 +120,7 @@
                                                                       "entityKey":  "appleWatchBlockPairing",
                                                                       "booleanActions":  9,
                                                                       "defaultValue":  false,
-                                                                      "policyType":  45,
+                                                                      "policyType":  46,
                                                                       "enabled":  true
                                                                   },
                                                                   {
@@ -120,7 +137,7 @@
                                                                       "entityKey":  "bluetoothBlockModification",
                                                                       "booleanActions":  9,
                                                                       "defaultValue":  false,
-                                                                      "policyType":  45,
+                                                                      "policyType":  46,
                                                                       "enabled":  true
                                                                   },
                                                                   {
@@ -137,7 +154,7 @@
                                                                       "entityKey":  "hostPairingBlocked",
                                                                       "booleanActions":  9,
                                                                       "defaultValue":  false,
-                                                                      "policyType":  45,
+                                                                      "policyType":  46,
                                                                       "enabled":  true
                                                                   },
                                                                   {
@@ -159,7 +176,7 @@
                                                                                                 "entityKey":  "airPrintBlockCredentialsStorage",
                                                                                                 "booleanActions":  3,
                                                                                                 "defaultValue":  false,
-                                                                                                "policyType":  45,
+                                                                                                "policyType":  46,
                                                                                                 "enabled":  true
                                                                                             },
                                                                                             {
@@ -176,7 +193,7 @@
                                                                                                 "entityKey":  "airPrintForceTrustedTLS",
                                                                                                 "booleanActions":  9,
                                                                                                 "defaultValue":  false,
-                                                                                                "policyType":  45,
+                                                                                                "policyType":  46,
                                                                                                 "enabled":  true
                                                                                             },
                                                                                             {
@@ -193,7 +210,7 @@
                                                                                                 "entityKey":  "airPrintBlockiBeaconDiscovery",
                                                                                                 "booleanActions":  9,
                                                                                                 "defaultValue":  false,
-                                                                                                "policyType":  45,
+                                                                                                "policyType":  46,
                                                                                                 "enabled":  true
                                                                                             }
                                                                                         ],
@@ -203,7 +220,7 @@
                                                                       "entityKey":  "airPrintBlocked",
                                                                       "booleanActions":  9,
                                                                       "defaultValue":  false,
-                                                                      "policyType":  45,
+                                                                      "policyType":  46,
                                                                       "enabled":  true
                                                                   },
                                                                   {
@@ -220,7 +237,7 @@
                                                                       "entityKey":  "proximityBlockSetupToNewDevice",
                                                                       "booleanActions":  9,
                                                                       "defaultValue":  false,
-                                                                      "policyType":  45,
+                                                                      "policyType":  46,
                                                                       "enabled":  true
                                                                   },
                                                                   {
@@ -237,7 +254,7 @@
                                                                       "entityKey":  "filesUsbDriveAccessBlocked",
                                                                       "booleanActions":  9,
                                                                       "defaultValue":  false,
-                                                                      "policyType":  45,
+                                                                      "policyType":  46,
                                                                       "enabled":  true
                                                                   },
                                                                   {
@@ -254,7 +271,24 @@
                                                                       "entityKey":  "nfcBlocked",
                                                                       "booleanActions":  9,
                                                                       "defaultValue":  false,
-                                                                      "policyType":  45,
+                                                                      "policyType":  46,
+                                                                      "enabled":  true
+                                                                  },
+                                                                  {
+                                                                      "dataType":  0,
+                                                                      "category":  20,
+                                                                      "nameResourceKey":  "unpairedExternalBootToRecoveryAllowedName",
+                                                                      "descriptionResourceKey":  "unpairedExternalBootToRecoveryAllowedDescription",
+                                                                      "childSettings":  [
+
+                                                                                        ],
+                                                                      "options":  [
+
+                                                                                  ],
+                                                                      "entityKey":  "unpairedExternalBootToRecoveryAllowed",
+                                                                      "booleanActions":  9,
+                                                                      "defaultValue":  false,
+                                                                      "policyType":  46,
                                                                       "enabled":  true
                                                                   }
                                                               ],
@@ -262,7 +296,7 @@
 
                                                         ],
                                             "booleanActions":  0,
-                                            "policyType":  45,
+                                            "policyType":  46,
                                             "enabled":  true
                                         }
                                     ]

Documentation/ObjectInfo/connecteddevices_macgeneral.json

@@ -20,7 +20,7 @@
                                                                   "entityKey":  "airDropBlocked",
                                                                   "booleanActions":  9,
                                                                   "defaultValue":  false,
-                                                                  "policyType":  60,
+                                                                  "policyType":  61,
                                                                   "enabled":  true
                                                               },
                                                               {
@@ -37,7 +37,7 @@
                                                                   "entityKey":  "appleWatchBlockAutoUnlock",
                                                                   "booleanActions":  9,
                                                                   "defaultValue":  false,
-                                                                  "policyType":  60,
+                                                                  "policyType":  61,
                                                                   "enabled":  true
                                                               }
                                                           ],
@@ -45,7 +45,7 @@
 
                                                     ],
                                         "booleanActions":  0,
-                                        "policyType":  60,
+                                        "policyType":  61,
                                         "enabled":  true
                                     }
 }

Documentation/ObjectInfo/connectivity_windows10general.json

@@ -29,7 +29,7 @@
                                               "booleanActions":  0,
                                               "defaultValue":  "allowed",
                                               "unconfiguredValue":  "allowed",
-                                              "policyType":  78,
+                                              "policyType":  79,
                                               "enabled":  true
                                           },
                                           {
@@ -46,7 +46,7 @@
                                               "entityKey":  "cellularBlockDataWhenRoaming",
                                               "booleanActions":  3,
                                               "defaultValue":  false,
-                                              "policyType":  78,
+                                              "policyType":  79,
                                               "enabled":  true
                                           },
                                           {
@@ -63,7 +63,7 @@
                                               "entityKey":  "cellularBlockVpn",
                                               "booleanActions":  3,
                                               "defaultValue":  false,
-                                              "policyType":  78,
+                                              "policyType":  79,
                                               "enabled":  true
                                           },
                                           {
@@ -80,7 +80,7 @@
                                               "entityKey":  "cellularBlockVpnWhenRoaming",
                                               "booleanActions":  3,
                                               "defaultValue":  false,
-                                              "policyType":  78,
+                                              "policyType":  79,
                                               "enabled":  true
                                           },
                                           {
@@ -97,7 +97,7 @@
                                               "entityKey":  "connectedDevicesServiceBlocked",
                                               "booleanActions":  3,
                                               "defaultValue":  false,
-                                              "policyType":  78,
+                                              "policyType":  79,
                                               "enabled":  true
                                           },
                                           {
@@ -114,7 +114,7 @@
                                               "entityKey":  "nfcBlocked",
                                               "booleanActions":  3,
                                               "defaultValue":  false,
-                                              "policyType":  78,
+                                              "policyType":  79,
                                               "enabled":  true
                                           },
                                           {
@@ -131,7 +131,7 @@
                                               "entityKey":  "wiFiBlocked",
                                               "booleanActions":  3,
                                               "defaultValue":  false,
-                                              "policyType":  78,
+                                              "policyType":  79,
                                               "enabled":  true
                                           },
                                           {
@@ -148,7 +148,7 @@
                                               "entityKey":  "wiFiBlockAutomaticConnectHotspots",
                                               "booleanActions":  3,
                                               "defaultValue":  false,
-                                              "policyType":  78,
+                                              "policyType":  79,
                                               "enabled":  true
                                           },
                                           {
@@ -165,7 +165,7 @@
                                               "entityKey":  "wiFiBlockManualConfiguration",
                                               "booleanActions":  3,
                                               "defaultValue":  false,
-                                              "policyType":  78,
+                                              "policyType":  79,
                                               "enabled":  true
                                           },
                                           {
@@ -182,7 +182,7 @@
                                                           ],
                                               "entityKey":  "wiFiScanInterval",
                                               "booleanActions":  0,
-                                              "policyType":  78,
+                                              "policyType":  79,
                                               "enabled":  true
                                           },
                                           {
@@ -198,7 +198,7 @@
 
                                                           ],
                                               "booleanActions":  0,
-                                              "policyType":  78,
+                                              "policyType":  79,
                                               "enabled":  true
                                           },
                                           {
@@ -215,7 +215,7 @@
                                               "entityKey":  "bluetoothBlocked",
                                               "booleanActions":  3,
                                               "defaultValue":  false,
-                                              "policyType":  78,
+                                              "policyType":  79,
                                               "enabled":  true
                                           },
                                           {
@@ -232,7 +232,7 @@
                                               "entityKey":  "bluetoothBlockDiscoverableMode",
                                               "booleanActions":  3,
                                               "defaultValue":  false,
-                                              "policyType":  78,
+                                              "policyType":  79,
                                               "enabled":  true
                                           },
                                           {
@@ -249,7 +249,7 @@
                                               "entityKey":  "bluetoothBlockPrePairing",
                                               "booleanActions":  3,
                                               "defaultValue":  false,
-                                              "policyType":  78,
+                                              "policyType":  79,
                                               "enabled":  true
                                           },
                                           {
@@ -266,7 +266,7 @@
                                               "entityKey":  "bluetoothBlockAdvertising",
                                               "booleanActions":  3,
                                               "defaultValue":  false,
-                                              "policyType":  78,
+                                              "policyType":  79,
                                               "enabled":  true
                                           },
                                           {
@@ -284,7 +284,7 @@
                                               "booleanActions":  3,
                                               "defaultValue":  false,
                                               "unconfiguredValue":  false,
-                                              "policyType":  78,
+                                              "policyType":  79,
                                               "enabled":  true
                                           },
                                           {
@@ -303,7 +303,7 @@
                                                                                                ],
                                                                                    "entityKey":  "guidExample",
                                                                                    "booleanActions":  0,
-                                                                                   "policyType":  78,
+                                                                                   "policyType":  79,
                                                                                    "enabled":  true
                                                                                }
                                                               }
@@ -320,7 +320,7 @@
                                                           ],
                                               "entityKey":  "bluetoothAllowedServices",
                                               "booleanActions":  0,
-                                              "policyType":  78,
+                                              "policyType":  79,
                                               "enabled":  true
                                           }
                                       ]

Documentation/ObjectInfo/connectivity_windowsphonegeneral.json

@@ -14,7 +14,7 @@
                                                  "entityKey":  "wifiBlocked",
                                                  "booleanActions":  3,
                                                  "defaultValue":  false,
-                                                 "policyType":  100,
+                                                 "policyType":  101,
                                                  "enabled":  true
                                              },
                                              {
@@ -31,7 +31,7 @@
                                                  "entityKey":  "cellularBlockWifiTethering",
                                                  "booleanActions":  3,
                                                  "defaultValue":  false,
-                                                 "policyType":  100,
+                                                 "policyType":  101,
                                                  "enabled":  true
                                              },
                                              {
@@ -48,7 +48,7 @@
                                                  "entityKey":  "wifiBlockAutomaticConnectHotspots",
                                                  "booleanActions":  3,
                                                  "defaultValue":  false,
-                                                 "policyType":  100,
+                                                 "policyType":  101,
                                                  "enabled":  true
                                              },
                                              {
@@ -65,7 +65,7 @@
                                                  "entityKey":  "wifiBlockHotspotReporting",
                                                  "booleanActions":  3,
                                                  "defaultValue":  false,
-                                                 "policyType":  100,
+                                                 "policyType":  101,
                                                  "enabled":  true
                                              },
                                              {
@@ -82,7 +82,7 @@
                                                  "entityKey":  "nfcBlocked",
                                                  "booleanActions":  3,
                                                  "defaultValue":  false,
-                                                 "policyType":  100,
+                                                 "policyType":  101,
                                                  "enabled":  true
                                              },
                                              {
@@ -99,7 +99,7 @@
                                                  "entityKey":  "bluetoothBlocked",
                                                  "booleanActions":  3,
                                                  "defaultValue":  false,
-                                                 "policyType":  100,
+                                                 "policyType":  101,
                                                  "enabled":  true
                                              }
                                          ]

Documentation/ObjectInfo/contentcaching_macdevicefeatures.json

@@ -41,11 +41,11 @@
                                                                                                  "entityKey":  "contentCachingType",
                                                                                                  "booleanActions":  0,
                                                                                                  "defaultValue":  "notConfigured",
-                                                                                                 "policyType":  57,
+                                                                                                 "policyType":  58,
                                                                                                  "enabled":  true
                                                                                              },
                                                                                              {
-                                                                                                 "dataType":  14,
+                                                                                                 "dataType":  15,
                                                                                                  "category":  22,
                                                                                                  "nameResourceKey":  "contentCachingMaxSizeBytesName",
                                                                                                  "descriptionResourceKey":  "contentCachingMaxSizeBytesDescription",
@@ -59,7 +59,7 @@
                                                                                                  "entityKey":  "contentCachingMaxSizeBytes",
                                                                                                  "booleanActions":  0,
                                                                                                  "defaultValue":  0,
-                                                                                                 "policyType":  57,
+                                                                                                 "policyType":  58,
                                                                                                  "enabled":  true
                                                                                              },
                                                                                              {
@@ -76,7 +76,7 @@
                                                                                                              ],
                                                                                                  "entityKey":  "contentCachingDataPath",
                                                                                                  "booleanActions":  0,
-                                                                                                 "policyType":  57,
+                                                                                                 "policyType":  58,
                                                                                                  "enabled":  true
                                                                                              },
                                                                                              {
@@ -93,7 +93,7 @@
                                                                                                  "entityKey":  "contentCachingPort",
                                                                                                  "booleanActions":  0,
                                                                                                  "defaultValue":  0,
-                                                                                                 "policyType":  57,
+                                                                                                 "policyType":  58,
                                                                                                  "enabled":  true
                                                                                              },
                                                                                              {
@@ -115,7 +115,7 @@
                                                                                                                                        ],
                                                                                                                            "entityKey":  "contentCachingForceConnectionSharing",
                                                                                                                            "booleanActions":  9,
-                                                                                                                           "policyType":  57,
+                                                                                                                           "policyType":  58,
                                                                                                                            "enabled":  true
                                                                                                                        }
                                                                                                                    ],
@@ -124,7 +124,7 @@
                                                                                                              ],
                                                                                                  "entityKey":  "contentCachingDisableConnectionSharing",
                                                                                                  "booleanActions":  9,
-                                                                                                 "policyType":  57,
+                                                                                                 "policyType":  58,
                                                                                                  "enabled":  true
                                                                                              },
                                                                                              {
@@ -140,7 +140,7 @@
                                                                                                              ],
                                                                                                  "entityKey":  "contentCachingLogClientIdentities",
                                                                                                  "booleanActions":  9,
-                                                                                                 "policyType":  57,
+                                                                                                 "policyType":  58,
                                                                                                  "enabled":  true
                                                                                              },
                                                                                              {
@@ -156,7 +156,7 @@
                                                                                                              ],
                                                                                                  "entityKey":  "contentCachingBlockDeletion",
                                                                                                  "booleanActions":  9,
-                                                                                                 "policyType":  57,
+                                                                                                 "policyType":  58,
                                                                                                  "enabled":  true
                                                                                              },
                                                                                              {
@@ -172,7 +172,7 @@
                                                                                                              ],
                                                                                                  "entityKey":  "contentCachingShowAlerts",
                                                                                                  "booleanActions":  9,
-                                                                                                 "policyType":  57,
+                                                                                                 "policyType":  58,
                                                                                                  "enabled":  true
                                                                                              },
                                                                                              {
@@ -188,7 +188,7 @@
                                                                                                              ],
                                                                                                  "entityKey":  "contentCachingKeepAwake",
                                                                                                  "booleanActions":  9,
-                                                                                                 "policyType":  57,
+                                                                                                 "policyType":  58,
                                                                                                  "enabled":  true
                                                                                              },
                                                                                              {
@@ -247,7 +247,7 @@
                                                                                                                                                                                            ],
                                                                                                                                                                                "entityKey":  "@odata.type",
                                                                                                                                                                                "booleanActions":  0,
-                                                                                                                                                                               "policyType":  57,
+                                                                                                                                                                               "policyType":  58,
                                                                                                                                                                                "enabled":  true
                                                                                                                                                                            }
                                                                                                                                                           },
@@ -265,7 +265,7 @@
                                                                                                                                                                                            ],
                                                                                                                                                                                "entityKey":  "lowerAddress",
                                                                                                                                                                                "booleanActions":  0,
-                                                                                                                                                                               "policyType":  57,
+                                                                                                                                                                               "policyType":  58,
                                                                                                                                                                                "enabled":  true
                                                                                                                                                                            }
                                                                                                                                                           },
@@ -283,7 +283,7 @@
                                                                                                                                                                                            ],
                                                                                                                                                                                "entityKey":  "upperAddress",
                                                                                                                                                                                "booleanActions":  0,
-                                                                                                                                                                               "policyType":  57,
+                                                                                                                                                                               "policyType":  58,
                                                                                                                                                                                "enabled":  true
                                                                                                                                                                            }
                                                                                                                                                           }
@@ -300,7 +300,7 @@
                                                                                                                                                       ],
                                                                                                                                           "entityKey":  "contentCachingClientListenRanges",
                                                                                                                                           "booleanActions":  0,
-                                                                                                                                          "policyType":  57,
+                                                                                                                                          "policyType":  58,
                                                                                                                                           "enabled":  true
                                                                                                                                       }
                                                                                                                                   ],
@@ -338,7 +338,7 @@
                                                                                                                                                                                            ],
                                                                                                                                                                                "entityKey":  "@odata.type",
                                                                                                                                                                                "booleanActions":  0,
-                                                                                                                                                                               "policyType":  57,
+                                                                                                                                                                               "policyType":  58,
                                                                                                                                                                                "enabled":  true
                                                                                                                                                                            }
                                                                                                                                                           },
@@ -356,7 +356,7 @@
                                                                                                                                                                                            ],
                                                                                                                                                                                "entityKey":  "lowerAddress",
                                                                                                                                                                                "booleanActions":  0,
-                                                                                                                                                                               "policyType":  57,
+                                                                                                                                                                               "policyType":  58,
                                                                                                                                                                                "enabled":  true
                                                                                                                                                                            }
                                                                                                                                                           },
@@ -374,7 +374,7 @@
                                                                                                                                                                                            ],
                                                                                                                                                                                "entityKey":  "upperAddress",
                                                                                                                                                                                "booleanActions":  0,
-                                                                                                                                                                               "policyType":  57,
+                                                                                                                                                                               "policyType":  58,
                                                                                                                                                                                "enabled":  true
                                                                                                                                                                            }
                                                                                                                                                           }
@@ -391,7 +391,7 @@
                                                                                                                                                       ],
                                                                                                                                           "entityKey":  "contentCachingClientListenRanges",
                                                                                                                                           "booleanActions":  0,
-                                                                                                                                          "policyType":  57,
+                                                                                                                                          "policyType":  58,
                                                                                                                                           "enabled":  true
                                                                                                                                       }
                                                                                                                                   ],
@@ -401,7 +401,7 @@
                                                                                                  "entityKey":  "contentCachingClientPolicy",
                                                                                                  "booleanActions":  0,
                                                                                                  "defaultValue":  "notConfigured",
-                                                                                                 "policyType":  57,
+                                                                                                 "policyType":  58,
                                                                                                  "enabled":  true
                                                                                              },
                                                                                              {
@@ -432,7 +432,7 @@
                                                                                                                                                   ],
                                                                                                                                       "entityKey":  "@odata.type",
                                                                                                                                       "booleanActions":  0,
-                                                                                                                                      "policyType":  57,
+                                                                                                                                      "policyType":  58,
                                                                                                                                       "enabled":  true
                                                                                                                                   }
                                                                                                                  },
@@ -450,7 +450,7 @@
                                                                                                                                                   ],
                                                                                                                                       "entityKey":  "lowerAddress",
                                                                                                                                       "booleanActions":  0,
-                                                                                                                                      "policyType":  57,
+                                                                                                                                      "policyType":  58,
                                                                                                                                       "enabled":  true
                                                                                                                                   }
                                                                                                                  },
@@ -468,7 +468,7 @@
                                                                                                                                                   ],
                                                                                                                                       "entityKey":  "upperAddress",
                                                                                                                                       "booleanActions":  0,
-                                                                                                                                      "policyType":  57,
+                                                                                                                                      "policyType":  58,
                                                                                                                                       "enabled":  true
                                                                                                                                   }
                                                                                                                  }
@@ -485,7 +485,7 @@
                                                                                                              ],
                                                                                                  "entityKey":  "contentCachingPublicRanges",
                                                                                                  "booleanActions":  0,
-                                                                                                 "policyType":  57,
+                                                                                                 "policyType":  58,
                                                                                                  "enabled":  true
                                                                                              },
                                                                                              {
@@ -544,7 +544,7 @@
                                                                                                                                                                                            ],
                                                                                                                                                                                "entityKey":  "@odata.type",
                                                                                                                                                                                "booleanActions":  0,
-                                                                                                                                                                               "policyType":  57,
+                                                                                                                                                                               "policyType":  58,
                                                                                                                                                                                "enabled":  true
                                                                                                                                                                            }
                                                                                                                                                           },
@@ -562,7 +562,7 @@
                                                                                                                                                                                            ],
                                                                                                                                                                                "entityKey":  "lowerAddress",
                                                                                                                                                                                "booleanActions":  0,
-                                                                                                                                                                               "policyType":  57,
+                                                                                                                                                                               "policyType":  58,
                                                                                                                                                                                "enabled":  true
                                                                                                                                                                            }
                                                                                                                                                           },
@@ -580,7 +580,7 @@
                                                                                                                                                                                            ],
                                                                                                                                                                                "entityKey":  "upperAddress",
                                                                                                                                                                                "booleanActions":  0,
-                                                                                                                                                                               "policyType":  57,
+                                                                                                                                                                               "policyType":  58,
                                                                                                                                                                                "enabled":  true
                                                                                                                                                                            }
                                                                                                                                                           }
@@ -597,7 +597,7 @@
                                                                                                                                                       ],
                                                                                                                                           "entityKey":  "contentCachingPeerListenRanges",
                                                                                                                                           "booleanActions":  0,
-                                                                                                                                          "policyType":  57,
+                                                                                                                                          "policyType":  58,
                                                                                                                                           "enabled":  true
                                                                                                                                       },
                                                                                                                                       {
@@ -628,7 +628,7 @@
                                                                                                                                                                                            ],
                                                                                                                                                                                "entityKey":  "@odata.type",
                                                                                                                                                                                "booleanActions":  0,
-                                                                                                                                                                               "policyType":  57,
+                                                                                                                                                                               "policyType":  58,
                                                                                                                                                                                "enabled":  true
                                                                                                                                                                            }
                                                                                                                                                           },
@@ -646,7 +646,7 @@
                                                                                                                                                                                            ],
                                                                                                                                                                                "entityKey":  "lowerAddress",
                                                                                                                                                                                "booleanActions":  0,
-                                                                                                                                                                               "policyType":  57,
+                                                                                                                                                                               "policyType":  58,
                                                                                                                                                                                "enabled":  true
                                                                                                                                                                            }
                                                                                                                                                           },
@@ -664,7 +664,7 @@
                                                                                                                                                                                            ],
                                                                                                                                                                                "entityKey":  "upperAddress",
                                                                                                                                                                                "booleanActions":  0,
-                                                                                                                                                                               "policyType":  57,
+                                                                                                                                                                               "policyType":  58,
                                                                                                                                                                                "enabled":  true
                                                                                                                                                                            }
                                                                                                                                                           }
@@ -681,7 +681,7 @@
                                                                                                                                                       ],
                                                                                                                                           "entityKey":  "contentCachingPeerFilterRanges",
                                                                                                                                           "booleanActions":  0,
-                                                                                                                                          "policyType":  57,
+                                                                                                                                          "policyType":  58,
                                                                                                                                           "enabled":  true
                                                                                                                                       }
                                                                                                                                   ],
@@ -691,7 +691,7 @@
                                                                                                  "entityKey":  "contentCachingPeerPolicy",
                                                                                                  "booleanActions":  0,
                                                                                                  "defaultValue":  "notConfigured",
-                                                                                                 "policyType":  57,
+                                                                                                 "policyType":  58,
                                                                                                  "enabled":  true
                                                                                              },
                                                                                              {
@@ -709,7 +709,7 @@
                                                                                                                                                   ],
                                                                                                                                       "entityKey":  "contentCachingParents",
                                                                                                                                       "booleanActions":  0,
-                                                                                                                                      "policyType":  57,
+                                                                                                                                      "policyType":  58,
                                                                                                                                       "enabled":  true
                                                                                                                                   }
                                                                                                                  }
@@ -726,7 +726,7 @@
                                                                                                              ],
                                                                                                  "entityKey":  "contentCachingParents",
                                                                                                  "booleanActions":  0,
-                                                                                                 "policyType":  57,
+                                                                                                 "policyType":  58,
                                                                                                  "enabled":  true
                                                                                              },
                                                                                              {
@@ -772,7 +772,7 @@
                                                                                                  "entityKey":  "contentCachingParentSelectionPolicy",
                                                                                                  "booleanActions":  0,
                                                                                                  "defaultValue":  "notConfigured",
-                                                                                                 "policyType":  57,
+                                                                                                 "policyType":  58,
                                                                                                  "enabled":  true
                                                                                              }
                                                                                          ],
@@ -781,7 +781,7 @@
                                                                                    ],
                                                                        "entityKey":  "contentCachingEnabled",
                                                                        "booleanActions":  9,
-                                                                       "policyType":  57,
+                                                                       "policyType":  58,
                                                                        "enabled":  true
                                                                    }
                                                                ],
@@ -789,7 +789,7 @@
 
                                                          ],
                                              "booleanActions":  0,
-                                             "policyType":  57,
+                                             "policyType":  58,
                                              "enabled":  true
                                          }
 }

Documentation/ObjectInfo/controlpanelandsettings_windows10general.json

@@ -25,7 +25,7 @@
                                                                                                          "entityKey":  "settingsBlockChangePowerSleep",
                                                                                                          "booleanActions":  3,
                                                                                                          "defaultValue":  false,
-                                                                                                         "policyType":  78,
+                                                                                                         "policyType":  79,
                                                                                                          "enabled":  true
                                                                                                      }
                                                                                                  ],
@@ -35,7 +35,7 @@
                                                                                "entityKey":  "settingsBlockSystemPage",
                                                                                "booleanActions":  3,
                                                                                "defaultValue":  false,
-                                                                               "policyType":  78,
+                                                                               "policyType":  79,
                                                                                "enabled":  true
                                                                            },
                                                                            {
@@ -52,7 +52,7 @@
                                                                                "entityKey":  "settingsBlockDevicesPage",
                                                                                "booleanActions":  3,
                                                                                "defaultValue":  false,
-                                                                               "policyType":  78,
+                                                                               "policyType":  79,
                                                                                "enabled":  true
                                                                            },
                                                                            {
@@ -69,7 +69,7 @@
                                                                                "entityKey":  "settingsBlockNetworkInternetPage",
                                                                                "booleanActions":  3,
                                                                                "defaultValue":  false,
-                                                                               "policyType":  78,
+                                                                               "policyType":  79,
                                                                                "enabled":  true
                                                                            },
                                                                            {
@@ -86,7 +86,7 @@
                                                                                "entityKey":  "settingsBlockPersonalizationPage",
                                                                                "booleanActions":  3,
                                                                                "defaultValue":  false,
-                                                                               "policyType":  78,
+                                                                               "policyType":  79,
                                                                                "enabled":  true
                                                                            },
                                                                            {
@@ -103,7 +103,7 @@
                                                                                "entityKey":  "settingsBlockAppsPage",
                                                                                "booleanActions":  3,
                                                                                "defaultValue":  false,
-                                                                               "policyType":  78,
+                                                                               "policyType":  79,
                                                                                "enabled":  true
                                                                            },
                                                                            {
@@ -120,7 +120,7 @@
                                                                                "entityKey":  "settingsBlockAccountsPage",
                                                                                "booleanActions":  3,
                                                                                "defaultValue":  false,
-                                                                               "policyType":  78,
+                                                                               "policyType":  79,
                                                                                "enabled":  true
                                                                            },
                                                                            {
@@ -143,7 +143,7 @@
                                                                                                          "entityKey":  "settingsBlockChangeSystemTime",
                                                                                                          "booleanActions":  3,
                                                                                                          "defaultValue":  false,
-                                                                                                         "policyType":  78,
+                                                                                                         "policyType":  79,
                                                                                                          "enabled":  true
                                                                                                      },
                                                                                                      {
@@ -160,7 +160,7 @@
                                                                                                          "entityKey":  "settingsBlockChangeRegion",
                                                                                                          "booleanActions":  3,
                                                                                                          "defaultValue":  false,
-                                                                                                         "policyType":  78,
+                                                                                                         "policyType":  79,
                                                                                                          "enabled":  true
                                                                                                      },
                                                                                                      {
@@ -177,7 +177,7 @@
                                                                                                          "entityKey":  "settingsBlockChangeLanguage",
                                                                                                          "booleanActions":  3,
                                                                                                          "defaultValue":  false,
-                                                                                                         "policyType":  78,
+                                                                                                         "policyType":  79,
                                                                                                          "enabled":  true
                                                                                                      }
                                                                                                  ],
@@ -187,7 +187,7 @@
                                                                                "entityKey":  "settingsBlockTimeLanguagePage",
                                                                                "booleanActions":  3,
                                                                                "defaultValue":  false,
-                                                                               "policyType":  78,
+                                                                               "policyType":  79,
                                                                                "enabled":  true
                                                                            },
                                                                            {
@@ -204,7 +204,7 @@
                                                                                "entityKey":  "settingsBlockGamingPage",
                                                                                "booleanActions":  3,
                                                                                "defaultValue":  false,
-                                                                               "policyType":  78,
+                                                                               "policyType":  79,
                                                                                "enabled":  true
                                                                            },
                                                                            {
@@ -221,7 +221,7 @@
                                                                                "entityKey":  "settingsBlockEaseOfAccessPage",
                                                                                "booleanActions":  3,
                                                                                "defaultValue":  false,
-                                                                               "policyType":  78,
+                                                                               "policyType":  79,
                                                                                "enabled":  true
                                                                            },
                                                                            {
@@ -238,7 +238,7 @@
                                                                                "entityKey":  "settingsBlockPrivacyPage",
                                                                                "booleanActions":  3,
                                                                                "defaultValue":  false,
-                                                                               "policyType":  78,
+                                                                               "policyType":  79,
                                                                                "enabled":  true
                                                                            },
                                                                            {
@@ -255,7 +255,7 @@
                                                                                "entityKey":  "settingsBlockUpdateSecurityPage",
                                                                                "booleanActions":  3,
                                                                                "defaultValue":  false,
-                                                                               "policyType":  78,
+                                                                               "policyType":  79,
                                                                                "enabled":  true
                                                                            }
                                                                        ],
@@ -265,7 +265,7 @@
                                                      "entityKey":  "settingsBlockSettingsApp",
                                                      "booleanActions":  3,
                                                      "defaultValue":  false,
-                                                     "policyType":  78,
+                                                     "policyType":  79,
                                                      "enabled":  true
                                                  }
 }

Documentation/ObjectInfo/credentialguard_windows10endpointprotection.json

@@ -33,7 +33,7 @@
                                                         "booleanActions":  0,
                                                         "defaultValue":  "notConfigured",
                                                         "unconfiguredValue":  "notConfigured",
-                                                        "policyType":  76,
+                                                        "policyType":  77,
                                                         "enabled":  true
                                                     }
 }

Documentation/ObjectInfo/customcompliance_compliancewindows10.json

@@ -1,7 +1,7 @@
 {
     "customcompliance_compliancewindows10":  {
                                                  "dataType":  25,
-                                                 "category":  142,
+                                                 "category":  143,
                                                  "childSettings":  [
 
                                                                    ],

Documentation/ObjectInfo/customconfiguration_ioscustom.json

@@ -14,7 +14,7 @@
                                               "entityKey":  "payloadName",
                                               "booleanActions":  0,
                                               "defaultValue":  "",
-                                              "policyType":  40,
+                                              "policyType":  41,
                                               "enabled":  true
                                           },
                                           {
@@ -32,7 +32,7 @@
                                                           ],
                                               "entityKey":  "payload",
                                               "booleanActions":  0,
-                                              "policyType":  40,
+                                              "policyType":  41,
                                               "enabled":  true
                                           }
                                       ]

Documentation/ObjectInfo/customconfiguration_maccustom.json

@@ -14,7 +14,34 @@
                                               "entityKey":  "payloadName",
                                               "booleanActions":  0,
                                               "defaultValue":  "",
-                                              "policyType":  55,
+                                              "policyType":  56,
+                                              "enabled":  true
+                                          },
+                                          {
+                                              "dataType":  16,
+                                              "category":  25,
+                                              "nameResourceKey":  "customPolicyConfigurationDeploymentChannelName",
+                                              "descriptionResourceKey":  "customPolicyConfigurationDeploymentChannelDescription",
+                                              "childSettings":  [
+
+                                                                ],
+                                              "options":  [
+                                                              {
+                                                                  "nameResourceKey":  "customPolicyConfigurationDeviceChannel",
+                                                                  "value":  "deviceChannel",
+                                                                  "enabled":  true
+                                                              },
+                                                              {
+                                                                  "nameResourceKey":  "customPolicyConfigurationUserChannel",
+                                                                  "value":  "userChannel",
+                                                                  "enabled":  true
+                                                              }
+                                                          ],
+                                              "entityKey":  "deploymentChannel",
+                                              "booleanActions":  0,
+                                              "defaultValue":  "deviceChannel",
+                                              "unconfiguredValue":  "deviceChannel",
+                                              "policyType":  56,
                                               "enabled":  true
                                           },
                                           {
@@ -32,7 +59,7 @@
                                                           ],
                                               "entityKey":  "payload",
                                               "booleanActions":  0,
-                                              "policyType":  55,
+                                              "policyType":  56,
                                               "enabled":  true
                                           }
                                       ]

Documentation/ObjectInfo/customomasettings_windows10custom.json

@@ -15,7 +15,7 @@
                                                                                                ],
                                                                                    "entityKey":  "displayName",
                                                                                    "booleanActions":  0,
-                                                                                   "policyType":  73,
+                                                                                   "policyType":  74,
                                                                                    "enabled":  true
                                                                                }
                                                               },
@@ -33,7 +33,7 @@
                                                                                                ],
                                                                                    "entityKey":  "description",
                                                                                    "booleanActions":  0,
-                                                                                   "policyType":  73,
+                                                                                   "policyType":  74,
                                                                                    "enabled":  true
                                                                                }
                                                               },
@@ -51,7 +51,7 @@
                                                                                                ],
                                                                                    "entityKey":  "omaUri",
                                                                                    "booleanActions":  0,
-                                                                                   "policyType":  73,
+                                                                                   "policyType":  74,
                                                                                    "enabled":  true
                                                                                }
                                                               },
@@ -86,7 +86,7 @@
                                                                                                                                         ],
                                                                                                                             "entityKey":  "value",
                                                                                                                             "booleanActions":  0,
-                                                                                                                            "policyType":  73,
+                                                                                                                            "policyType":  74,
                                                                                                                             "enabled":  true
                                                                                                                         }
                                                                                                                     ],
@@ -111,7 +111,7 @@
                                                                                                                                         ],
                                                                                                                             "entityKey":  "value",
                                                                                                                             "booleanActions":  0,
-                                                                                                                            "policyType":  73,
+                                                                                                                            "policyType":  74,
                                                                                                                             "enabled":  true
                                                                                                                         }
                                                                                                                     ],
@@ -134,7 +134,7 @@
                                                                                                                                         ],
                                                                                                                             "entityKey":  "value",
                                                                                                                             "booleanActions":  0,
-                                                                                                                            "policyType":  73,
+                                                                                                                            "policyType":  74,
                                                                                                                             "enabled":  true
                                                                                                                         }
                                                                                                                     ],
@@ -157,7 +157,7 @@
                                                                                                                                         ],
                                                                                                                             "entityKey":  "value",
                                                                                                                             "booleanActions":  0,
-                                                                                                                            "policyType":  73,
+                                                                                                                            "policyType":  74,
                                                                                                                             "enabled":  true
                                                                                                                         }
                                                                                                                     ],
@@ -180,7 +180,7 @@
                                                                                                                                         ],
                                                                                                                             "entityKey":  "value",
                                                                                                                             "booleanActions":  0,
-                                                                                                                            "policyType":  73,
+                                                                                                                            "policyType":  74,
                                                                                                                             "enabled":  true
                                                                                                                         }
                                                                                                                     ],
@@ -213,7 +213,7 @@
                                                                                                                             "entityKey":  "value",
                                                                                                                             "booleanActions":  0,
                                                                                                                             "defaultValue":  false,
-                                                                                                                            "policyType":  73,
+                                                                                                                            "policyType":  74,
                                                                                                                             "enabled":  true
                                                                                                                         }
                                                                                                                     ],
@@ -238,7 +238,7 @@
                                                                                                                                         ],
                                                                                                                             "entityKey":  "value",
                                                                                                                             "booleanActions":  0,
-                                                                                                                            "policyType":  73,
+                                                                                                                            "policyType":  74,
                                                                                                                             "enabled":  true
                                                                                                                         }
                                                                                                                     ],
@@ -247,7 +247,7 @@
                                                                                                ],
                                                                                    "entityKey":  "@odata.type",
                                                                                    "booleanActions":  0,
-                                                                                   "policyType":  73,
+                                                                                   "policyType":  74,
                                                                                    "enabled":  true
                                                                                }
                                                               }
@@ -265,7 +265,7 @@
                                               "entityKey":  "omaSettings",
                                               "booleanActions":  0,
                                               "defaultValue":  "",
-                                              "policyType":  73,
+                                              "policyType":  74,
                                               "enabled":  true
                                           }
 }

Documentation/ObjectInfo/customomasettings_windowsphonecustom.json

@@ -15,7 +15,7 @@
                                                                                                   ],
                                                                                       "entityKey":  "displayName",
                                                                                       "booleanActions":  0,
-                                                                                      "policyType":  98,
+                                                                                      "policyType":  99,
                                                                                       "enabled":  true
                                                                                   }
                                                                  },
@@ -33,7 +33,7 @@
                                                                                                   ],
                                                                                       "entityKey":  "description",
                                                                                       "booleanActions":  0,
-                                                                                      "policyType":  98,
+                                                                                      "policyType":  99,
                                                                                       "enabled":  true
                                                                                   }
                                                                  },
@@ -51,7 +51,7 @@
                                                                                                   ],
                                                                                       "entityKey":  "omaUri",
                                                                                       "booleanActions":  0,
-                                                                                      "policyType":  98,
+                                                                                      "policyType":  99,
                                                                                       "enabled":  true
                                                                                   }
                                                                  },
@@ -86,7 +86,7 @@
                                                                                                                                            ],
                                                                                                                                "entityKey":  "value",
                                                                                                                                "booleanActions":  0,
-                                                                                                                               "policyType":  98,
+                                                                                                                               "policyType":  99,
                                                                                                                                "enabled":  true
                                                                                                                            }
                                                                                                                        ],
@@ -111,7 +111,7 @@
                                                                                                                                            ],
                                                                                                                                "entityKey":  "value",
                                                                                                                                "booleanActions":  0,
-                                                                                                                               "policyType":  98,
+                                                                                                                               "policyType":  99,
                                                                                                                                "enabled":  true
                                                                                                                            }
                                                                                                                        ],
@@ -134,7 +134,7 @@
                                                                                                                                            ],
                                                                                                                                "entityKey":  "value",
                                                                                                                                "booleanActions":  0,
-                                                                                                                               "policyType":  98,
+                                                                                                                               "policyType":  99,
                                                                                                                                "enabled":  true
                                                                                                                            }
                                                                                                                        ],
@@ -157,7 +157,7 @@
                                                                                                                                            ],
                                                                                                                                "entityKey":  "value",
                                                                                                                                "booleanActions":  0,
-                                                                                                                               "policyType":  98,
+                                                                                                                               "policyType":  99,
                                                                                                                                "enabled":  true
                                                                                                                            }
                                                                                                                        ],
@@ -180,7 +180,7 @@
                                                                                                                                            ],
                                                                                                                                "entityKey":  "value",
                                                                                                                                "booleanActions":  0,
-                                                                                                                               "policyType":  98,
+                                                                                                                               "policyType":  99,
                                                                                                                                "enabled":  true
                                                                                                                            }
                                                                                                                        ],
@@ -213,7 +213,7 @@
                                                                                                                                "entityKey":  "value",
                                                                                                                                "booleanActions":  0,
                                                                                                                                "defaultValue":  false,
-                                                                                                                               "policyType":  98,
+                                                                                                                               "policyType":  99,
                                                                                                                                "enabled":  true
                                                                                                                            }
                                                                                                                        ],
@@ -238,7 +238,7 @@
                                                                                                                                            ],
                                                                                                                                "entityKey":  "value",
                                                                                                                                "booleanActions":  0,
-                                                                                                                               "policyType":  98,
+                                                                                                                               "policyType":  99,
                                                                                                                                "enabled":  true
                                                                                                                            }
                                                                                                                        ],
@@ -247,7 +247,7 @@
                                                                                                   ],
                                                                                       "entityKey":  "@odata.type",
                                                                                       "booleanActions":  0,
-                                                                                      "policyType":  98,
+                                                                                      "policyType":  99,
                                                                                       "enabled":  true
                                                                                   }
                                                                  }
@@ -265,7 +265,7 @@
                                                  "entityKey":  "omaSettings",
                                                  "booleanActions":  0,
                                                  "defaultValue":  "",
-                                                 "policyType":  98,
+                                                 "policyType":  99,
                                                  "enabled":  true
                                              }
 }

Documentation/ObjectInfo/custompreferences_maccustompreferences.json

@@ -14,7 +14,7 @@
                                                                    ],
                                                        "entityKey":  "bundleId",
                                                        "booleanActions":  0,
-                                                       "policyType":  56,
+                                                       "policyType":  57,
                                                        "enabled":  true
                                                    },
                                                    {
@@ -31,7 +31,7 @@
                                                                    ],
                                                        "entityKey":  "configurationXml",
                                                        "booleanActions":  0,
-                                                       "policyType":  56,
+                                                       "policyType":  57,
                                                        "enabled":  true
                                                    }
                                                ]

Documentation/ObjectInfo/defender_windows10general.json

@@ -14,7 +14,7 @@
                                           "entityKey":  "defenderRequireRealTimeMonitoring",
                                           "booleanActions":  2,
                                           "defaultValue":  false,
-                                          "policyType":  78,
+                                          "policyType":  79,
                                           "enabled":  true
                                       },
                                       {
@@ -31,7 +31,7 @@
                                           "entityKey":  "defenderRequireBehaviorMonitoring",
                                           "booleanActions":  2,
                                           "defaultValue":  false,
-                                          "policyType":  78,
+                                          "policyType":  79,
                                           "enabled":  true
                                       },
                                       {
@@ -48,7 +48,7 @@
                                           "entityKey":  "defenderRequireNetworkInspectionSystem",
                                           "booleanActions":  2,
                                           "defaultValue":  false,
-                                          "policyType":  78,
+                                          "policyType":  79,
                                           "enabled":  true
                                       },
                                       {
@@ -65,7 +65,7 @@
                                           "entityKey":  "defenderScanDownloads",
                                           "booleanActions":  2,
                                           "defaultValue":  false,
-                                          "policyType":  78,
+                                          "policyType":  79,
                                           "enabled":  true
                                       },
                                       {
@@ -92,7 +92,7 @@
                                           "booleanActions":  0,
                                           "defaultValue":  false,
                                           "unconfiguredValue":  false,
-                                          "policyType":  78,
+                                          "policyType":  79,
                                           "enabled":  true
                                       },
                                       {
@@ -119,7 +119,7 @@
                                           "booleanActions":  0,
                                           "defaultValue":  false,
                                           "unconfiguredValue":  false,
-                                          "policyType":  78,
+                                          "policyType":  79,
                                           "enabled":  true
                                       },
                                       {
@@ -146,7 +146,7 @@
                                           "booleanActions":  0,
                                           "defaultValue":  false,
                                           "unconfiguredValue":  false,
-                                          "policyType":  78,
+                                          "policyType":  79,
                                           "enabled":  true
                                       },
                                       {
@@ -163,7 +163,7 @@
                                           "entityKey":  "defenderScanScriptsLoadedInInternetExplorer",
                                           "booleanActions":  2,
                                           "defaultValue":  false,
-                                          "policyType":  78,
+                                          "policyType":  79,
                                           "enabled":  true
                                       },
                                       {
@@ -180,7 +180,7 @@
                                           "entityKey":  "defenderBlockEndUserAccess",
                                           "booleanActions":  3,
                                           "defaultValue":  false,
-                                          "policyType":  78,
+                                          "policyType":  79,
                                           "enabled":  true
                                       },
                                       {
@@ -324,7 +324,7 @@
                                                       ],
                                           "entityKey":  "defenderSignatureUpdateIntervalInHours",
                                           "booleanActions":  0,
-                                          "policyType":  78,
+                                          "policyType":  79,
                                           "enabled":  true
                                       },
                                       {
@@ -361,7 +361,7 @@
                                           "booleanActions":  0,
                                           "defaultValue":  "userDefined",
                                           "unconfiguredValue":  "userDefined",
-                                          "policyType":  78,
+                                          "policyType":  79,
                                           "enabled":  true
                                       },
                                       {
@@ -379,7 +379,7 @@
                                           "entityKey":  "defenderDaysBeforeDeletingQuarantinedMalware",
                                           "booleanActions":  0,
                                           "defaultValue":  0,
-                                          "policyType":  78,
+                                          "policyType":  79,
                                           "enabled":  true
                                       },
                                       {
@@ -396,7 +396,7 @@
                                                       ],
                                           "entityKey":  "defenderScanMaxCpu",
                                           "booleanActions":  0,
-                                          "policyType":  78,
+                                          "policyType":  79,
                                           "enabled":  true
                                       },
                                       {
@@ -413,7 +413,7 @@
                                           "entityKey":  "defenderScanArchiveFiles",
                                           "booleanActions":  2,
                                           "defaultValue":  false,
-                                          "policyType":  78,
+                                          "policyType":  79,
                                           "enabled":  true
                                       },
                                       {
@@ -430,7 +430,7 @@
                                           "entityKey":  "defenderScanIncomingMail",
                                           "booleanActions":  2,
                                           "defaultValue":  false,
-                                          "policyType":  78,
+                                          "policyType":  79,
                                           "enabled":  true
                                       },
                                       {
@@ -447,7 +447,7 @@
                                           "entityKey":  "defenderScanRemovableDrivesDuringFullScan",
                                           "booleanActions":  2,
                                           "defaultValue":  false,
-                                          "policyType":  78,
+                                          "policyType":  79,
                                           "enabled":  true
                                       },
                                       {
@@ -464,7 +464,7 @@
                                           "entityKey":  "defenderScanMappedNetworkDrivesDuringFullScan",
                                           "booleanActions":  2,
                                           "defaultValue":  false,
-                                          "policyType":  78,
+                                          "policyType":  79,
                                           "enabled":  true
                                       },
                                       {
@@ -481,7 +481,7 @@
                                           "entityKey":  "defenderScanNetworkFiles",
                                           "booleanActions":  2,
                                           "defaultValue":  false,
-                                          "policyType":  78,
+                                          "policyType":  79,
                                           "enabled":  true
                                       },
                                       {
@@ -498,7 +498,7 @@
                                           "entityKey":  "defenderRequireCloudProtection",
                                           "booleanActions":  2,
                                           "defaultValue":  false,
-                                          "policyType":  78,
+                                          "policyType":  79,
                                           "enabled":  true
                                       },
                                       {
@@ -535,7 +535,7 @@
                                           "booleanActions":  0,
                                           "defaultValue":  "notConfigured",
                                           "unconfiguredValue":  "notConfigured",
-                                          "policyType":  78,
+                                          "policyType":  79,
                                           "enabled":  true
                                       },
                                       {
@@ -553,7 +553,7 @@
                                           "entityKey":  "defenderCloudExtendedTimeout",
                                           "booleanActions":  0,
                                           "defaultValue":  0,
-                                          "policyType":  78,
+                                          "policyType":  79,
                                           "enabled":  true
                                       },
                                       {
@@ -595,7 +595,7 @@
                                           "booleanActions":  0,
                                           "defaultValue":  "userDefined",
                                           "unconfiguredValue":  "userDefined",
-                                          "policyType":  78,
+                                          "policyType":  79,
                                           "enabled":  true
                                       },
                                       {
@@ -734,7 +734,7 @@
                                                       ],
                                           "entityKey":  "defenderScheduledQuickScanTime",
                                           "booleanActions":  0,
-                                          "policyType":  78,
+                                          "policyType":  79,
                                           "enabled":  true
                                       },
                                       {
@@ -816,7 +816,7 @@
                                                                                                ],
                                                                                    "entityKey":  "defenderSystemScanSchedule",
                                                                                    "booleanActions":  0,
-                                                                                   "policyType":  78,
+                                                                                   "policyType":  79,
                                                                                    "enabled":  true
                                                                                },
                                                                                {
@@ -955,7 +955,7 @@
                                                                                                ],
                                                                                    "entityKey":  "defenderScheduledScanTime",
                                                                                    "booleanActions":  0,
-                                                                                   "policyType":  78,
+                                                                                   "policyType":  79,
                                                                                    "enabled":  true
                                                                                }
                                                                            ],
@@ -1026,7 +1026,7 @@
                                                                                                ],
                                                                                    "entityKey":  "defenderSystemScanSchedule",
                                                                                    "booleanActions":  0,
-                                                                                   "policyType":  78,
+                                                                                   "policyType":  79,
                                                                                    "enabled":  true
                                                                                },
                                                                                {
@@ -1165,7 +1165,7 @@
                                                                                                ],
                                                                                    "entityKey":  "defenderScheduledScanTime",
                                                                                    "booleanActions":  0,
-                                                                                   "policyType":  78,
+                                                                                   "policyType":  79,
                                                                                    "enabled":  true
                                                                                }
                                                                            ],
@@ -1176,7 +1176,7 @@
                                           "booleanActions":  0,
                                           "defaultValue":  "userDefined",
                                           "unconfiguredValue":  "userDefined",
-                                          "policyType":  78,
+                                          "policyType":  79,
                                           "enabled":  true
                                       },
                                       {
@@ -1210,7 +1210,7 @@
                                                       ],
                                           "entityKey":  "defenderPotentiallyUnwantedAppAction",
                                           "booleanActions":  0,
-                                          "policyType":  78,
+                                          "policyType":  79,
                                           "enabled":  true
                                       },
                                       {
@@ -1237,7 +1237,7 @@
                                           "booleanActions":  0,
                                           "defaultValue":  false,
                                           "unconfiguredValue":  false,
-                                          "policyType":  78,
+                                          "policyType":  79,
                                           "enabled":  true
                                       },
                                       {
@@ -1299,7 +1299,7 @@
                                           "booleanActions":  0,
                                           "defaultValue":  "everyday",
                                           "unconfiguredValue":  "everyday",
-                                          "policyType":  78,
+                                          "policyType":  79,
                                           "enabled":  false
                                       },
                                       {
@@ -1357,7 +1357,7 @@
                                                                     "booleanActions":  0,
                                                                     "defaultValue":  "deviceDefault",
                                                                     "unconfiguredValue":  "deviceDefault",
-                                                                    "policyType":  78,
+                                                                    "policyType":  79,
                                                                     "enabled":  true
                                                                 },
                                                                 {
@@ -1409,7 +1409,7 @@
                                                                     "booleanActions":  0,
                                                                     "defaultValue":  "deviceDefault",
                                                                     "unconfiguredValue":  "deviceDefault",
-                                                                    "policyType":  78,
+                                                                    "policyType":  79,
                                                                     "enabled":  true
                                                                 },
                                                                 {
@@ -1461,7 +1461,7 @@
                                                                     "booleanActions":  0,
                                                                     "defaultValue":  "deviceDefault",
                                                                     "unconfiguredValue":  "deviceDefault",
-                                                                    "policyType":  78,
+                                                                    "policyType":  79,
                                                                     "enabled":  true
                                                                 },
                                                                 {
@@ -1513,7 +1513,7 @@
                                                                     "booleanActions":  0,
                                                                     "defaultValue":  "deviceDefault",
                                                                     "unconfiguredValue":  "deviceDefault",
-                                                                    "policyType":  78,
+                                                                    "policyType":  79,
                                                                     "enabled":  true
                                                                 }
                                                             ],
@@ -1523,7 +1523,7 @@
                                           "entityKey":  "syntheticDefenderDetectedMalwareActionsEnabled",
                                           "booleanActions":  2,
                                           "defaultValue":  false,
-                                          "policyType":  78,
+                                          "policyType":  79,
                                           "enabled":  true
                                       },
                                       {
@@ -1548,7 +1548,7 @@
                                                                                                                                                 ],
                                                                                                                                     "entityKey":  "nameColumn",
                                                                                                                                     "booleanActions":  0,
-                                                                                                                                    "policyType":  78,
+                                                                                                                                    "policyType":  79,
                                                                                                                                     "enabled":  true
                                                                                                                                 }
                                                                                                                }
@@ -1565,7 +1565,7 @@
                                                                                                            ],
                                                                                                "entityKey":  "defenderFilesAndFoldersToExclude",
                                                                                                "booleanActions":  0,
-                                                                                               "policyType":  78,
+                                                                                               "policyType":  79,
                                                                                                "enabled":  true
                                                                                            },
                                                                                            {
@@ -1584,7 +1584,7 @@
                                                                                                                                                 ],
                                                                                                                                     "entityKey":  "extensionsColumn",
                                                                                                                                     "booleanActions":  0,
-                                                                                                                                    "policyType":  78,
+                                                                                                                                    "policyType":  79,
                                                                                                                                     "enabled":  true
                                                                                                                                 }
                                                                                                                }
@@ -1601,7 +1601,7 @@
                                                                                                            ],
                                                                                                "entityKey":  "defenderFileExtensionsToExclude",
                                                                                                "booleanActions":  0,
-                                                                                               "policyType":  78,
+                                                                                               "policyType":  79,
                                                                                                "enabled":  true
                                                                                            },
                                                                                            {
@@ -1620,7 +1620,7 @@
                                                                                                                                                 ],
                                                                                                                                     "entityKey":  "processesColumn",
                                                                                                                                     "booleanActions":  0,
-                                                                                                                                    "policyType":  78,
+                                                                                                                                    "policyType":  79,
                                                                                                                                     "enabled":  true
                                                                                                                                 }
                                                                                                                }
@@ -1637,7 +1637,7 @@
                                                                                                            ],
                                                                                                "entityKey":  "defenderProcessesToExclude",
                                                                                                "booleanActions":  0,
-                                                                                               "policyType":  78,
+                                                                                               "policyType":  79,
                                                                                                "enabled":  true
                                                                                            }
                                                                                        ],
@@ -1651,7 +1651,7 @@
 
                                                                                 ],
                                                                     "booleanActions":  0,
-                                                                    "policyType":  78,
+                                                                    "policyType":  79,
                                                                     "enabled":  true
                                                                 }
                                                             ],
@@ -1659,7 +1659,7 @@
 
                                                       ],
                                           "booleanActions":  0,
-                                          "policyType":  78,
+                                          "policyType":  79,
                                           "enabled":  true
                                       }
                                   ]

Documentation/ObjectInfo/defenderantivirus_windows10endpointprotection.json

@@ -2,7 +2,7 @@
     "defenderantivirus_windows10endpointprotection":  [
                                                           {
                                                               "dataType":  19,
-                                                              "category":  141,
+                                                              "category":  142,
                                                               "nameResourceKey":  "enableRealTimeMonitoringName",
                                                               "descriptionResourceKey":  "empty",
                                                               "childSettings":  [
@@ -23,12 +23,12 @@
                                                               "entityKey":  "defenderAllowRealTimeMonitoring",
                                                               "booleanActions":  0,
                                                               "defaultValue":  false,
-                                                              "policyType":  76,
+                                                              "policyType":  77,
                                                               "enabled":  true
                                                           },
                                                           {
                                                               "dataType":  19,
-                                                              "category":  141,
+                                                              "category":  142,
                                                               "nameResourceKey":  "enableBehaviorMonitoringName",
                                                               "descriptionResourceKey":  "EnableBehaviorMonitoringDescription",
                                                               "childSettings":  [
@@ -49,12 +49,12 @@
                                                               "entityKey":  "defenderAllowBehaviorMonitoring",
                                                               "booleanActions":  0,
                                                               "defaultValue":  false,
-                                                              "policyType":  76,
+                                                              "policyType":  77,
                                                               "enabled":  true
                                                           },
                                                           {
                                                               "dataType":  19,
-                                                              "category":  141,
+                                                              "category":  142,
                                                               "nameResourceKey":  "enableNetworkInspectionSystemName",
                                                               "descriptionResourceKey":  "enableNetworkInspectionSystemDescription",
                                                               "childSettings":  [
@@ -75,12 +75,12 @@
                                                               "entityKey":  "defenderAllowIntrusionPreventionSystem",
                                                               "booleanActions":  0,
                                                               "defaultValue":  false,
-                                                              "policyType":  76,
+                                                              "policyType":  77,
                                                               "enabled":  true
                                                           },
                                                           {
                                                               "dataType":  19,
-                                                              "category":  141,
+                                                              "category":  142,
                                                               "nameResourceKey":  "scanAllDownloadsName",
                                                               "descriptionResourceKey":  "empty",
                                                               "childSettings":  [
@@ -101,12 +101,12 @@
                                                               "entityKey":  "defenderAllowScanDownloads",
                                                               "booleanActions":  0,
                                                               "defaultValue":  false,
-                                                              "policyType":  76,
+                                                              "policyType":  77,
                                                               "enabled":  true
                                                           },
                                                           {
                                                               "dataType":  19,
-                                                              "category":  141,
+                                                              "category":  142,
                                                               "nameResourceKey":  "defenderScheduleScanEnableLowCpuPriorityName",
                                                               "descriptionResourceKey":  "defenderScheduleScanEnableLowCpuPriorityDescription",
                                                               "childSettings":  [
@@ -128,12 +128,12 @@
                                                               "booleanActions":  0,
                                                               "defaultValue":  false,
                                                               "unconfiguredValue":  false,
-                                                              "policyType":  76,
+                                                              "policyType":  77,
                                                               "enabled":  true
                                                           },
                                                           {
                                                               "dataType":  19,
-                                                              "category":  141,
+                                                              "category":  142,
                                                               "nameResourceKey":  "defenderDisableCatchupQuickScanName",
                                                               "descriptionResourceKey":  "defenderDisableCatchupQuickScanDescription",
                                                               "childSettings":  [
@@ -155,12 +155,12 @@
                                                               "booleanActions":  0,
                                                               "defaultValue":  false,
                                                               "unconfiguredValue":  false,
-                                                              "policyType":  76,
+                                                              "policyType":  77,
                                                               "enabled":  true
                                                           },
                                                           {
                                                               "dataType":  19,
-                                                              "category":  141,
+                                                              "category":  142,
                                                               "nameResourceKey":  "defenderDisableCatchupFullScanName",
                                                               "descriptionResourceKey":  "defenderDisableCatchupFullScanDescription",
                                                               "childSettings":  [
@@ -182,12 +182,12 @@
                                                               "booleanActions":  0,
                                                               "defaultValue":  false,
                                                               "unconfiguredValue":  false,
-                                                              "policyType":  76,
+                                                              "policyType":  77,
                                                               "enabled":  true
                                                           },
                                                           {
                                                               "dataType":  19,
-                                                              "category":  141,
+                                                              "category":  142,
                                                               "nameResourceKey":  "scriptScanningName",
                                                               "descriptionResourceKey":  "empty",
                                                               "childSettings":  [
@@ -208,12 +208,12 @@
                                                               "entityKey":  "defenderAllowScanScriptsLoadedInInternetExplorer",
                                                               "booleanActions":  0,
                                                               "defaultValue":  false,
-                                                              "policyType":  76,
+                                                              "policyType":  77,
                                                               "enabled":  true
                                                           },
                                                           {
                                                               "dataType":  19,
-                                                              "category":  141,
+                                                              "category":  142,
                                                               "nameResourceKey":  "enableEndUserAccessToDefenderName",
                                                               "descriptionResourceKey":  "empty",
                                                               "childSettings":  [
@@ -234,12 +234,12 @@
                                                               "entityKey":  "defenderAllowEndUserAccess",
                                                               "booleanActions":  0,
                                                               "defaultValue":  false,
-                                                              "policyType":  76,
+                                                              "policyType":  77,
                                                               "enabled":  true
                                                           },
                                                           {
                                                               "dataType":  0,
-                                                              "category":  141,
+                                                              "category":  142,
                                                               "nameResourceKey":  "checkForSignaturesBeforeRunningScanName",
                                                               "descriptionResourceKey":  "empty",
                                                               "childSettings":  [
@@ -251,12 +251,12 @@
                                                               "entityKey":  "defenderCheckForSignaturesBeforeRunningScan",
                                                               "booleanActions":  2,
                                                               "defaultValue":  false,
-                                                              "policyType":  76,
+                                                              "policyType":  77,
                                                               "enabled":  true
                                                           },
                                                           {
                                                               "dataType":  16,
-                                                              "category":  141,
+                                                              "category":  142,
                                                               "nameResourceKey":  "monitorFileAndProgramActivityName",
                                                               "descriptionResourceKey":  "empty",
                                                               "childSettings":  [
@@ -283,12 +283,12 @@
                                                               "booleanActions":  0,
                                                               "defaultValue":  "monitorAllFiles",
                                                               "unconfiguredValue":  "monitorAllFiles",
-                                                              "policyType":  76,
+                                                              "policyType":  77,
                                                               "enabled":  true
                                                           },
                                                           {
                                                               "dataType":  14,
-                                                              "category":  141,
+                                                              "category":  142,
                                                               "nameResourceKey":  "daysToTrackResolvedMalwareName",
                                                               "descriptionResourceKey":  "DaysToTrackResolvedMalwareDescription",
                                                               "emptyValueResourceKey":  "daysToTrackResolvedMalwarePlaceholder",
@@ -301,12 +301,12 @@
                                                               "entityKey":  "defenderDaysBeforeDeletingQuarantinedMalware",
                                                               "booleanActions":  0,
                                                               "defaultValue":  0,
-                                                              "policyType":  76,
+                                                              "policyType":  77,
                                                               "enabled":  true
                                                           },
                                                           {
                                                               "dataType":  14,
-                                                              "category":  141,
+                                                              "category":  142,
                                                               "nameResourceKey":  "limitCPUUsageDuringScanName",
                                                               "descriptionResourceKey":  "limitCPUUsageDuringScanDescription",
                                                               "emptyValueResourceKey":  "limitCPUUsageDuringScanPlaceholder",
@@ -318,12 +318,12 @@
                                                                           ],
                                                               "entityKey":  "defenderScanMaxCpuPercentage",
                                                               "booleanActions":  0,
-                                                              "policyType":  76,
+                                                              "policyType":  77,
                                                               "enabled":  true
                                                           },
                                                           {
                                                               "dataType":  19,
-                                                              "category":  141,
+                                                              "category":  142,
                                                               "nameResourceKey":  "scanArchiveFilesName",
                                                               "descriptionResourceKey":  "empty",
                                                               "childSettings":  [
@@ -344,12 +344,12 @@
                                                               "entityKey":  "defenderAllowScanArchiveFiles",
                                                               "booleanActions":  0,
                                                               "defaultValue":  false,
-                                                              "policyType":  76,
+                                                              "policyType":  77,
                                                               "enabled":  true
                                                           },
                                                           {
                                                               "dataType":  0,
-                                                              "category":  141,
+                                                              "category":  142,
                                                               "nameResourceKey":  "scanIncomingMailMessagesName",
                                                               "descriptionResourceKey":  "empty",
                                                               "childSettings":  [
@@ -361,12 +361,12 @@
                                                               "entityKey":  "defenderEnableScanIncomingMail",
                                                               "booleanActions":  2,
                                                               "defaultValue":  false,
-                                                              "policyType":  76,
+                                                              "policyType":  77,
                                                               "enabled":  true
                                                           },
                                                           {
                                                               "dataType":  19,
-                                                              "category":  141,
+                                                              "category":  142,
                                                               "nameResourceKey":  "scanRemovableDrivesDuringFullScanName",
                                                               "descriptionResourceKey":  "scanRemovableDrivesDuringFullScanDescription",
                                                               "childSettings":  [
@@ -387,12 +387,12 @@
                                                               "entityKey":  "defenderAllowScanRemovableDrivesDuringFullScan",
                                                               "booleanActions":  0,
                                                               "defaultValue":  false,
-                                                              "policyType":  76,
+                                                              "policyType":  77,
                                                               "enabled":  true
                                                           },
                                                           {
                                                               "dataType":  0,
-                                                              "category":  141,
+                                                              "category":  142,
                                                               "nameResourceKey":  "scanMappedNetworkDrivesDuringFullScanName",
                                                               "descriptionResourceKey":  "readOnlyMappingDescription",
                                                               "childSettings":  [
@@ -404,12 +404,12 @@
                                                               "entityKey":  "defenderEnableScanMappedNetworkDrivesDuringFullScan",
                                                               "booleanActions":  2,
                                                               "defaultValue":  false,
-                                                              "policyType":  76,
+                                                              "policyType":  77,
                                                               "enabled":  true
                                                           },
                                                           {
                                                               "dataType":  19,
-                                                              "category":  141,
+                                                              "category":  142,
                                                               "nameResourceKey":  "scanFilesOpenedFromNetworkFoldersName",
                                                               "descriptionResourceKey":  "readOnlyMappingDescription",
                                                               "childSettings":  [
@@ -430,12 +430,12 @@
                                                               "entityKey":  "defenderAllowScanNetworkFiles",
                                                               "booleanActions":  0,
                                                               "defaultValue":  false,
-                                                              "policyType":  76,
+                                                              "policyType":  77,
                                                               "enabled":  true
                                                           },
                                                           {
                                                               "dataType":  19,
-                                                              "category":  141,
+                                                              "category":  142,
                                                               "nameResourceKey":  "cloudProtectionName",
                                                               "descriptionResourceKey":  "cloudProtectionDescription",
                                                               "childSettings":  [
@@ -456,12 +456,12 @@
                                                               "entityKey":  "defenderAllowCloudProtection",
                                                               "booleanActions":  0,
                                                               "defaultValue":  false,
-                                                              "policyType":  76,
+                                                              "policyType":  77,
                                                               "enabled":  true
                                                           },
                                                           {
                                                               "dataType":  16,
-                                                              "category":  141,
+                                                              "category":  142,
                                                               "nameResourceKey":  "fileBlockingLevelName",
                                                               "descriptionResourceKey":  "fileBlockingLevelDescription",
                                                               "childSettings":  [
@@ -493,12 +493,12 @@
                                                               "booleanActions":  0,
                                                               "defaultValue":  "notConfigured",
                                                               "unconfiguredValue":  "notConfigured",
-                                                              "policyType":  76,
+                                                              "policyType":  77,
                                                               "enabled":  true
                                                           },
                                                           {
                                                               "dataType":  14,
-                                                              "category":  141,
+                                                              "category":  142,
                                                               "nameResourceKey":  "timeExtensionForFileScanName",
                                                               "descriptionResourceKey":  "TimeExtensionForFileScanDescription",
                                                               "emptyValueResourceKey":  "timeExtensionForFileScanPlaceholder",
@@ -511,12 +511,12 @@
                                                               "entityKey":  "defenderCloudExtendedTimeoutInSeconds",
                                                               "booleanActions":  0,
                                                               "defaultValue":  0,
-                                                              "policyType":  76,
+                                                              "policyType":  77,
                                                               "enabled":  true
                                                           },
                                                           {
                                                               "dataType":  16,
-                                                              "category":  141,
+                                                              "category":  142,
                                                               "nameResourceKey":  "typeOfSystemScanName",
                                                               "descriptionResourceKey":  "empty",
                                                               "childSettings":  [
@@ -539,7 +539,7 @@
                                                                                   "children":  [
                                                                                                    {
                                                                                                        "dataType":  16,
-                                                                                                       "category":  141,
+                                                                                                       "category":  142,
                                                                                                        "nameResourceKey":  "dayScheduled",
                                                                                                        "descriptionResourceKey":  "empty",
                                                                                                        "childSettings":  [
@@ -596,12 +596,12 @@
                                                                                                        "booleanActions":  0,
                                                                                                        "defaultValue":  "everyday",
                                                                                                        "unconfiguredValue":  "everyday",
-                                                                                                       "policyType":  76,
+                                                                                                       "policyType":  77,
                                                                                                        "enabled":  true
                                                                                                    },
                                                                                                    {
                                                                                                        "dataType":  16,
-                                                                                                       "category":  141,
+                                                                                                       "category":  142,
                                                                                                        "nameResourceKey":  "timeScheduled",
                                                                                                        "descriptionResourceKey":  "empty",
                                                                                                        "childSettings":  [
@@ -735,7 +735,7 @@
                                                                                                                    ],
                                                                                                        "entityKey":  "defenderScheduledScanTime",
                                                                                                        "booleanActions":  0,
-                                                                                                       "policyType":  76,
+                                                                                                       "policyType":  77,
                                                                                                        "enabled":  true
                                                                                                    }
                                                                                                ],
@@ -747,7 +747,7 @@
                                                                                   "children":  [
                                                                                                    {
                                                                                                        "dataType":  16,
-                                                                                                       "category":  141,
+                                                                                                       "category":  142,
                                                                                                        "nameResourceKey":  "dayScheduled",
                                                                                                        "descriptionResourceKey":  "empty",
                                                                                                        "childSettings":  [
@@ -804,12 +804,12 @@
                                                                                                        "booleanActions":  0,
                                                                                                        "defaultValue":  "everyday",
                                                                                                        "unconfiguredValue":  "everyday",
-                                                                                                       "policyType":  76,
+                                                                                                       "policyType":  77,
                                                                                                        "enabled":  true
                                                                                                    },
                                                                                                    {
                                                                                                        "dataType":  16,
-                                                                                                       "category":  141,
+                                                                                                       "category":  142,
                                                                                                        "nameResourceKey":  "timeScheduled",
                                                                                                        "descriptionResourceKey":  "empty",
                                                                                                        "childSettings":  [
@@ -943,7 +943,7 @@
                                                                                                                    ],
                                                                                                        "entityKey":  "defenderScheduledScanTime",
                                                                                                        "booleanActions":  0,
-                                                                                                       "policyType":  76,
+                                                                                                       "policyType":  77,
                                                                                                        "enabled":  true
                                                                                                    }
                                                                                                ],
@@ -954,12 +954,12 @@
                                                               "booleanActions":  0,
                                                               "defaultValue":  "userDefined",
                                                               "unconfiguredValue":  "userDefined",
-                                                              "policyType":  76,
+                                                              "policyType":  77,
                                                               "enabled":  true
                                                           },
                                                           {
                                                               "dataType":  16,
-                                                              "category":  141,
+                                                              "category":  142,
                                                               "nameResourceKey":  "defenderPotentiallyUnwantedAppActionName",
                                                               "descriptionResourceKey":  "defenderPotentiallyUnwantedAppActionDescription",
                                                               "childSettings":  [
@@ -986,12 +986,12 @@
                                                               "booleanActions":  0,
                                                               "defaultValue":  "userDefined",
                                                               "unconfiguredValue":  "userDefined",
-                                                              "policyType":  76,
+                                                              "policyType":  77,
                                                               "enabled":  true
                                                           },
                                                           {
                                                               "dataType":  16,
-                                                              "category":  141,
+                                                              "category":  142,
                                                               "nameResourceKey":  "defenderSubmitSamplesConsentTypeName",
                                                               "descriptionResourceKey":  "defenderSubmitSamplesConsentTypeDesc",
                                                               "childSettings":  [
@@ -1023,12 +1023,12 @@
                                                               "booleanActions":  0,
                                                               "defaultValue":  "sendSafeSamplesAutomatically",
                                                               "unconfiguredValue":  "sendSafeSamplesAutomatically",
-                                                              "policyType":  76,
+                                                              "policyType":  77,
                                                               "enabled":  true
                                                           },
                                                           {
                                                               "dataType":  19,
-                                                              "category":  141,
+                                                              "category":  142,
                                                               "nameResourceKey":  "defenderBlockOnAccessProtectionName",
                                                               "descriptionResourceKey":  "defenderBlockOnAccessProtectionDesc",
                                                               "childSettings":  [
@@ -1050,18 +1050,18 @@
                                                               "booleanActions":  0,
                                                               "defaultValue":  false,
                                                               "unconfiguredValue":  false,
-                                                              "policyType":  76,
+                                                              "policyType":  77,
                                                               "enabled":  true
                                                           },
                                                           {
                                                               "dataType":  0,
-                                                              "category":  141,
+                                                              "category":  142,
                                                               "nameResourceKey":  "defenderDetectedMalwareActionsName",
                                                               "descriptionResourceKey":  "defenderDetectedMalwareActionsDescription",
                                                               "childSettings":  [
                                                                                     {
                                                                                         "dataType":  16,
-                                                                                        "category":  141,
+                                                                                        "category":  142,
                                                                                         "nameResourceKey":  "LowSeverity",
                                                                                         "descriptionResourceKey":  "empty",
                                                                                         "childSettings":  [
@@ -1108,12 +1108,12 @@
                                                                                         "booleanActions":  0,
                                                                                         "defaultValue":  "deviceDefault",
                                                                                         "unconfiguredValue":  "deviceDefault",
-                                                                                        "policyType":  76,
+                                                                                        "policyType":  77,
                                                                                         "enabled":  true
                                                                                     },
                                                                                     {
                                                                                         "dataType":  16,
-                                                                                        "category":  141,
+                                                                                        "category":  142,
                                                                                         "nameResourceKey":  "ModerateSeverity",
                                                                                         "descriptionResourceKey":  "empty",
                                                                                         "childSettings":  [
@@ -1160,12 +1160,12 @@
                                                                                         "booleanActions":  0,
                                                                                         "defaultValue":  "deviceDefault",
                                                                                         "unconfiguredValue":  "deviceDefault",
-                                                                                        "policyType":  76,
+                                                                                        "policyType":  77,
                                                                                         "enabled":  true
                                                                                     },
                                                                                     {
                                                                                         "dataType":  16,
-                                                                                        "category":  141,
+                                                                                        "category":  142,
                                                                                         "nameResourceKey":  "HighSeverity",
                                                                                         "descriptionResourceKey":  "empty",
                                                                                         "childSettings":  [
@@ -1212,12 +1212,12 @@
                                                                                         "booleanActions":  0,
                                                                                         "defaultValue":  "deviceDefault",
                                                                                         "unconfiguredValue":  "deviceDefault",
-                                                                                        "policyType":  76,
+                                                                                        "policyType":  77,
                                                                                         "enabled":  true
                                                                                     },
                                                                                     {
                                                                                         "dataType":  16,
-                                                                                        "category":  141,
+                                                                                        "category":  142,
                                                                                         "nameResourceKey":  "SevereSeverity",
                                                                                         "descriptionResourceKey":  "empty",
                                                                                         "childSettings":  [
@@ -1264,7 +1264,7 @@
                                                                                         "booleanActions":  0,
                                                                                         "defaultValue":  "deviceDefault",
                                                                                         "unconfiguredValue":  "deviceDefault",
-                                                                                        "policyType":  76,
+                                                                                        "policyType":  77,
                                                                                         "enabled":  true
                                                                                     }
                                                                                 ],
@@ -1274,12 +1274,12 @@
                                                               "entityKey":  "syntheticDefenderDetectedMalwareActionsEnabled",
                                                               "booleanActions":  2,
                                                               "defaultValue":  false,
-                                                              "policyType":  76,
+                                                              "policyType":  77,
                                                               "enabled":  true
                                                           },
                                                           {
                                                               "dataType":  9,
-                                                              "category":  141,
+                                                              "category":  142,
                                                               "childSettings":  [
                                                                                     {
                                                                                         "complexOptions":  [
@@ -1288,7 +1288,7 @@
                                                                                                                                    {
                                                                                                                                        "metadata":  {
                                                                                                                                                         "dataType":  20,
-                                                                                                                                                        "category":  141,
+                                                                                                                                                        "category":  142,
                                                                                                                                                         "nameResourceKey":  "nameColumn",
                                                                                                                                                         "emptyValueResourceKey":  "nameColumnExamples",
                                                                                                                                                         "childSettings":  [
@@ -1299,13 +1299,13 @@
                                                                                                                                                                     ],
                                                                                                                                                         "entityKey":  "nameColumn",
                                                                                                                                                         "booleanActions":  0,
-                                                                                                                                                        "policyType":  76,
+                                                                                                                                                        "policyType":  77,
                                                                                                                                                         "enabled":  true
                                                                                                                                                     }
                                                                                                                                    }
                                                                                                                                ],
                                                                                                                    "dataType":  21,
-                                                                                                                   "category":  141,
+                                                                                                                   "category":  142,
                                                                                                                    "nameResourceKey":  "filesAndFoldersToExcludeName",
                                                                                                                    "descriptionResourceKey":  "empty",
                                                                                                                    "childSettings":  [
@@ -1316,7 +1316,7 @@
                                                                                                                                ],
                                                                                                                    "entityKey":  "defenderFilesAndFoldersToExclude",
                                                                                                                    "booleanActions":  0,
-                                                                                                                   "policyType":  76,
+                                                                                                                   "policyType":  77,
                                                                                                                    "enabled":  true
                                                                                                                },
                                                                                                                {
@@ -1324,7 +1324,7 @@
                                                                                                                                    {
                                                                                                                                        "metadata":  {
                                                                                                                                                         "dataType":  20,
-                                                                                                                                                        "category":  141,
+                                                                                                                                                        "category":  142,
                                                                                                                                                         "nameResourceKey":  "extensionsColumn",
                                                                                                                                                         "emptyValueResourceKey":  "extensionsColumnExamples",
                                                                                                                                                         "childSettings":  [
@@ -1335,13 +1335,13 @@
                                                                                                                                                                     ],
                                                                                                                                                         "entityKey":  "extensionsColumn",
                                                                                                                                                         "booleanActions":  0,
-                                                                                                                                                        "policyType":  76,
+                                                                                                                                                        "policyType":  77,
                                                                                                                                                         "enabled":  true
                                                                                                                                                     }
                                                                                                                                    }
                                                                                                                                ],
                                                                                                                    "dataType":  21,
-                                                                                                                   "category":  141,
+                                                                                                                   "category":  142,
                                                                                                                    "nameResourceKey":  "fileExtensionsToExcludeName",
                                                                                                                    "descriptionResourceKey":  "empty",
                                                                                                                    "childSettings":  [
@@ -1352,7 +1352,7 @@
                                                                                                                                ],
                                                                                                                    "entityKey":  "defenderFileExtensionsToExclude",
                                                                                                                    "booleanActions":  0,
-                                                                                                                   "policyType":  76,
+                                                                                                                   "policyType":  77,
                                                                                                                    "enabled":  true
                                                                                                                },
                                                                                                                {
@@ -1360,7 +1360,7 @@
                                                                                                                                    {
                                                                                                                                        "metadata":  {
                                                                                                                                                         "dataType":  20,
-                                                                                                                                                        "category":  141,
+                                                                                                                                                        "category":  142,
                                                                                                                                                         "nameResourceKey":  "processesColumn",
                                                                                                                                                         "emptyValueResourceKey":  "processesColumnExamples",
                                                                                                                                                         "childSettings":  [
@@ -1371,13 +1371,13 @@
                                                                                                                                                                     ],
                                                                                                                                                         "entityKey":  "processesColumn",
                                                                                                                                                         "booleanActions":  0,
-                                                                                                                                                        "policyType":  76,
+                                                                                                                                                        "policyType":  77,
                                                                                                                                                         "enabled":  true
                                                                                                                                                     }
                                                                                                                                    }
                                                                                                                                ],
                                                                                                                    "dataType":  21,
-                                                                                                                   "category":  141,
+                                                                                                                   "category":  142,
                                                                                                                    "nameResourceKey":  "processesToExcludeName",
                                                                                                                    "descriptionResourceKey":  "empty",
                                                                                                                    "childSettings":  [
@@ -1388,12 +1388,12 @@
                                                                                                                                ],
                                                                                                                    "entityKey":  "defenderProcessesToExclude",
                                                                                                                    "booleanActions":  0,
-                                                                                                                   "policyType":  76,
+                                                                                                                   "policyType":  77,
                                                                                                                    "enabled":  true
                                                                                                                }
                                                                                                            ],
                                                                                         "dataType":  5,
-                                                                                        "category":  141,
+                                                                                        "category":  142,
                                                                                         "nameResourceKey":  "DefenderExclusions",
                                                                                         "childSettings":  [
 
@@ -1402,7 +1402,7 @@
 
                                                                                                     ],
                                                                                         "booleanActions":  0,
-                                                                                        "policyType":  76,
+                                                                                        "policyType":  77,
                                                                                         "enabled":  true
                                                                                     }
                                                                                 ],
@@ -1410,7 +1410,7 @@
 
                                                                           ],
                                                               "booleanActions":  0,
-                                                              "policyType":  76,
+                                                              "policyType":  77,
                                                               "enabled":  true
                                                           }
                                                       ]

Documentation/ObjectInfo/defenderexploitguard_windows10endpointprotection.json

@@ -15,7 +15,7 @@
 
                                                                                                         ],
                                                                                             "booleanActions":  0,
-                                                                                            "policyType":  76,
+                                                                                            "policyType":  77,
                                                                                             "enabled":  true
                                                                                         },
                                                                                         {
@@ -31,7 +31,7 @@
 
                                                                                                         ],
                                                                                             "booleanActions":  0,
-                                                                                            "policyType":  76,
+                                                                                            "policyType":  77,
                                                                                             "enabled":  true
                                                                                         },
                                                                                         {
@@ -47,7 +47,7 @@
 
                                                                                                         ],
                                                                                             "booleanActions":  0,
-                                                                                            "policyType":  76,
+                                                                                            "policyType":  77,
                                                                                             "enabled":  true
                                                                                         },
                                                                                         {
@@ -61,7 +61,7 @@
                                                                                             "options":  [
                                                                                                             {
                                                                                                                 "nameResourceKey":  "notConfigured",
-                                                                                                                "value":  "userDefined",
+                                                                                                                "value":  "notConfigured",
                                                                                                                 "enabled":  true
                                                                                                             },
                                                                                                             {
@@ -77,9 +77,9 @@
                                                                                                         ],
                                                                                             "entityKey":  "defenderPreventCredentialStealingType",
                                                                                             "booleanActions":  0,
-                                                                                            "defaultValue":  "userDefined",
+                                                                                            "defaultValue":  "notConfigured",
-                                                                                            "unconfiguredValue":  "userDefined",
+                                                                                            "unconfiguredValue":  "notConfigured",
-                                                                                            "policyType":  76,
+                                                                                            "policyType":  77,
                                                                                             "enabled":  true
                                                                                         },
                                                                                         {
@@ -93,7 +93,7 @@
                                                                                             "options":  [
                                                                                                             {
                                                                                                                 "nameResourceKey":  "notConfigured",
-                                                                                                                "value":  "userDefined",
+                                                                                                                "value":  "notConfigured",
                                                                                                                 "enabled":  true
                                                                                                             },
                                                                                                             {
@@ -109,9 +109,9 @@
                                                                                                         ],
                                                                                             "entityKey":  "defenderAdobeReaderLaunchChildProcess",
                                                                                             "booleanActions":  0,
-                                                                                            "defaultValue":  "userDefined",
+                                                                                            "defaultValue":  "notConfigured",
-                                                                                            "unconfiguredValue":  "userDefined",
+                                                                                            "unconfiguredValue":  "notConfigured",
-                                                                                            "policyType":  76,
+                                                                                            "policyType":  77,
                                                                                             "enabled":  true
                                                                                         },
                                                                                         {
@@ -127,7 +127,7 @@
 
                                                                                                         ],
                                                                                             "booleanActions":  0,
-                                                                                            "policyType":  76,
+                                                                                            "policyType":  77,
                                                                                             "enabled":  true
                                                                                         },
                                                                                         {
@@ -159,7 +159,7 @@
                                                                                             "booleanActions":  0,
                                                                                             "defaultValue":  "userDefined",
                                                                                             "unconfiguredValue":  "userDefined",
-                                                                                            "policyType":  76,
+                                                                                            "policyType":  77,
                                                                                             "enabled":  true
                                                                                         },
                                                                                         {
@@ -191,7 +191,7 @@
                                                                                             "booleanActions":  0,
                                                                                             "defaultValue":  "userDefined",
                                                                                             "unconfiguredValue":  "userDefined",
-                                                                                            "policyType":  76,
+                                                                                            "policyType":  77,
                                                                                             "enabled":  true
                                                                                         },
                                                                                         {
@@ -223,7 +223,7 @@
                                                                                             "booleanActions":  0,
                                                                                             "defaultValue":  "userDefined",
                                                                                             "unconfiguredValue":  "userDefined",
-                                                                                            "policyType":  76,
+                                                                                            "policyType":  77,
                                                                                             "enabled":  true
                                                                                         },
                                                                                         {
@@ -255,7 +255,7 @@
                                                                                             "booleanActions":  0,
                                                                                             "defaultValue":  "userDefined",
                                                                                             "unconfiguredValue":  "userDefined",
-                                                                                            "policyType":  76,
+                                                                                            "policyType":  77,
                                                                                             "enabled":  true
                                                                                         },
                                                                                         {
@@ -269,7 +269,7 @@
                                                                                             "options":  [
                                                                                                             {
                                                                                                                 "nameResourceKey":  "notConfigured",
-                                                                                                                "value":  "userDefined",
+                                                                                                                "value":  "notConfigured",
                                                                                                                 "enabled":  true
                                                                                                             },
                                                                                                             {
@@ -285,9 +285,9 @@
                                                                                                         ],
                                                                                             "entityKey":  "defenderOfficeCommunicationAppsLaunchChildProcess",
                                                                                             "booleanActions":  0,
-                                                                                            "defaultValue":  "userDefined",
+                                                                                            "defaultValue":  "notConfigured",
-                                                                                            "unconfiguredValue":  "userDefined",
+                                                                                            "unconfiguredValue":  "notConfigured",
-                                                                                            "policyType":  76,
+                                                                                            "policyType":  77,
                                                                                             "enabled":  true
                                                                                         },
                                                                                         {
@@ -303,7 +303,7 @@
 
                                                                                                         ],
                                                                                             "booleanActions":  0,
-                                                                                            "policyType":  76,
+                                                                                            "policyType":  77,
                                                                                             "enabled":  true
                                                                                         },
                                                                                         {
@@ -335,7 +335,7 @@
                                                                                             "booleanActions":  0,
                                                                                             "defaultValue":  "userDefined",
                                                                                             "unconfiguredValue":  "userDefined",
-                                                                                            "policyType":  76,
+                                                                                            "policyType":  77,
                                                                                             "enabled":  true
                                                                                         },
                                                                                         {
@@ -367,7 +367,7 @@
                                                                                             "booleanActions":  0,
                                                                                             "defaultValue":  "userDefined",
                                                                                             "unconfiguredValue":  "userDefined",
-                                                                                            "policyType":  76,
+                                                                                            "policyType":  77,
                                                                                             "enabled":  true
                                                                                         },
                                                                                         {
@@ -399,7 +399,7 @@
                                                                                             "booleanActions":  0,
                                                                                             "defaultValue":  "userDefined",
                                                                                             "unconfiguredValue":  "userDefined",
-                                                                                            "policyType":  76,
+                                                                                            "policyType":  77,
                                                                                             "enabled":  true
                                                                                         },
                                                                                         {
@@ -431,7 +431,7 @@
                                                                                             "booleanActions":  0,
                                                                                             "defaultValue":  "userDefined",
                                                                                             "unconfiguredValue":  "userDefined",
-                                                                                            "policyType":  76,
+                                                                                            "policyType":  77,
                                                                                             "enabled":  true
                                                                                         },
                                                                                         {
@@ -463,7 +463,7 @@
                                                                                             "booleanActions":  0,
                                                                                             "defaultValue":  "userDefined",
                                                                                             "unconfiguredValue":  "userDefined",
-                                                                                            "policyType":  76,
+                                                                                            "policyType":  77,
                                                                                             "enabled":  true
                                                                                         },
                                                                                         {
@@ -479,7 +479,7 @@
 
                                                                                                         ],
                                                                                             "booleanActions":  0,
-                                                                                            "policyType":  76,
+                                                                                            "policyType":  77,
                                                                                             "enabled":  true
                                                                                         },
                                                                                         {
@@ -511,7 +511,7 @@
                                                                                             "booleanActions":  0,
                                                                                             "defaultValue":  "userDefined",
                                                                                             "unconfiguredValue":  "userDefined",
-                                                                                            "policyType":  76,
+                                                                                            "policyType":  77,
                                                                                             "enabled":  true
                                                                                         },
                                                                                         {
@@ -527,7 +527,7 @@
 
                                                                                                         ],
                                                                                             "booleanActions":  0,
-                                                                                            "policyType":  76,
+                                                                                            "policyType":  77,
                                                                                             "enabled":  true
                                                                                         },
                                                                                         {
@@ -541,7 +541,7 @@
                                                                                             "options":  [
                                                                                                             {
                                                                                                                 "nameResourceKey":  "notConfigured",
-                                                                                                                "value":  "userDefined",
+                                                                                                                "value":  "notConfigured",
                                                                                                                 "enabled":  true
                                                                                                             },
                                                                                                             {
@@ -557,9 +557,9 @@
                                                                                                         ],
                                                                                             "entityKey":  "defenderAdvancedRansomewareProtectionType",
                                                                                             "booleanActions":  0,
-                                                                                            "defaultValue":  "userDefined",
+                                                                                            "defaultValue":  "notConfigured",
-                                                                                            "unconfiguredValue":  "userDefined",
+                                                                                            "unconfiguredValue":  "notConfigured",
-                                                                                            "policyType":  76,
+                                                                                            "policyType":  77,
                                                                                             "enabled":  true
                                                                                         },
                                                                                         {
@@ -575,7 +575,7 @@
 
                                                                                                         ],
                                                                                             "booleanActions":  0,
-                                                                                            "policyType":  76,
+                                                                                            "policyType":  77,
                                                                                             "enabled":  true
                                                                                         },
                                                                                         {
@@ -595,7 +595,7 @@
                                                                                                                                              ],
                                                                                                                                  "entityKey":  "defenderAttackSurfaceReductionExcludedPaths",
                                                                                                                                  "booleanActions":  0,
-                                                                                                                                 "policyType":  76,
+                                                                                                                                 "policyType":  77,
                                                                                                                                  "enabled":  true
                                                                                                                              }
                                                                                                             }
@@ -612,7 +612,7 @@
                                                                                                         ],
                                                                                             "entityKey":  "defenderAttackSurfaceReductionExcludedPaths",
                                                                                             "booleanActions":  0,
-                                                                                            "policyType":  76,
+                                                                                            "policyType":  77,
                                                                                             "enabled":  true
                                                                                         }
                                                                                     ],
@@ -626,7 +626,7 @@
 
                                                                              ],
                                                                  "booleanActions":  0,
-                                                                 "policyType":  76,
+                                                                 "policyType":  77,
                                                                  "enabled":  true
                                                              },
                                                              {
@@ -644,7 +644,7 @@
 
                                                                                                         ],
                                                                                             "booleanActions":  0,
-                                                                                            "policyType":  76,
+                                                                                            "policyType":  77,
                                                                                             "enabled":  true
                                                                                         },
                                                                                         {
@@ -660,7 +660,7 @@
 
                                                                                                         ],
                                                                                             "booleanActions":  0,
-                                                                                            "policyType":  76,
+                                                                                            "policyType":  77,
                                                                                             "enabled":  true
                                                                                         },
                                                                                         {
@@ -685,7 +685,7 @@
                                                                                                                                                                        ],
                                                                                                                                                            "entityKey":  "defenderGuardedFoldersAllowedAppPaths",
                                                                                                                                                            "booleanActions":  0,
-                                                                                                                                                           "policyType":  76,
+                                                                                                                                                           "policyType":  77,
                                                                                                                                                            "enabled":  true
                                                                                                                                                        }
                                                                                                                                       }
@@ -702,7 +702,7 @@
                                                                                                                                   ],
                                                                                                                       "entityKey":  "defenderGuardedFoldersAllowedAppPaths",
                                                                                                                       "booleanActions":  0,
-                                                                                                                      "policyType":  76,
+                                                                                                                      "policyType":  77,
                                                                                                                       "enabled":  true
                                                                                                                   },
                                                                                                                   {
@@ -721,7 +721,7 @@
                                                                                                                                                                        ],
                                                                                                                                                            "entityKey":  "defenderAdditionalGuardedFolders",
                                                                                                                                                            "booleanActions":  0,
-                                                                                                                                                           "policyType":  76,
+                                                                                                                                                           "policyType":  77,
                                                                                                                                                            "enabled":  true
                                                                                                                                                        }
                                                                                                                                       }
@@ -738,7 +738,7 @@
                                                                                                                                   ],
                                                                                                                       "entityKey":  "defenderAdditionalGuardedFolders",
                                                                                                                       "booleanActions":  0,
-                                                                                                                      "policyType":  76,
+                                                                                                                      "policyType":  77,
                                                                                                                       "enabled":  true
                                                                                                                   }
                                                                                                               ],
@@ -773,7 +773,7 @@
                                                                                             "booleanActions":  0,
                                                                                             "defaultValue":  "userDefined",
                                                                                             "unconfiguredValue":  "userDefined",
-                                                                                            "policyType":  76,
+                                                                                            "policyType":  77,
                                                                                             "enabled":  true
                                                                                         }
                                                                                     ],
@@ -787,7 +787,7 @@
 
                                                                              ],
                                                                  "booleanActions":  0,
-                                                                 "policyType":  76,
+                                                                 "policyType":  77,
                                                                  "enabled":  true
                                                              },
                                                              {
@@ -805,7 +805,7 @@
 
                                                                                                         ],
                                                                                             "booleanActions":  0,
-                                                                                            "policyType":  76,
+                                                                                            "policyType":  77,
                                                                                             "enabled":  true
                                                                                         },
                                                                                         {
@@ -821,7 +821,7 @@
 
                                                                                                         ],
                                                                                             "booleanActions":  0,
-                                                                                            "policyType":  76,
+                                                                                            "policyType":  77,
                                                                                             "enabled":  true
                                                                                         },
                                                                                         {
@@ -835,6 +835,11 @@
                                                                                             "options":  [
                                                                                                             {
                                                                                                                 "nameResourceKey":  "notConfigured",
+                                                                                                                "value":  "notConfigured",
+                                                                                                                "enabled":  true
+                                                                                                            },
+                                                                                                            {
+                                                                                                                "nameResourceKey":  "disableOption",
                                                                                                                 "value":  "userDefined",
                                                                                                                 "enabled":  true
                                                                                                             },
@@ -844,16 +849,16 @@
                                                                                                                 "enabled":  true
                                                                                                             },
                                                                                                             {
-                                                                                                                "nameResourceKey":  "auditOnly",
+                                                                                                                "nameResourceKey":  "auditOption",
                                                                                                                 "value":  "auditMode",
                                                                                                                 "enabled":  true
                                                                                                             }
                                                                                                         ],
                                                                                             "entityKey":  "defenderNetworkProtectionType",
                                                                                             "booleanActions":  0,
-                                                                                            "defaultValue":  "userDefined",
+                                                                                            "defaultValue":  "notConfigured",
-                                                                                            "unconfiguredValue":  "userDefined",
+                                                                                            "unconfiguredValue":  "notConfigured",
-                                                                                            "policyType":  76,
+                                                                                            "policyType":  77,
                                                                                             "enabled":  true
                                                                                         }
                                                                                     ],
@@ -867,7 +872,7 @@
 
                                                                              ],
                                                                  "booleanActions":  0,
-                                                                 "policyType":  76,
+                                                                 "policyType":  77,
                                                                  "enabled":  true
                                                              },
                                                              {
@@ -884,7 +889,7 @@
 
                                                                                                         ],
                                                                                             "booleanActions":  0,
-                                                                                            "policyType":  76,
+                                                                                            "policyType":  77,
                                                                                             "enabled":  true
                                                                                         },
                                                                                         {
@@ -900,7 +905,7 @@
 
                                                                                                         ],
                                                                                             "booleanActions":  0,
-                                                                                            "policyType":  76,
+                                                                                            "policyType":  77,
                                                                                             "enabled":  true
                                                                                         },
                                                                                         {
@@ -916,7 +921,7 @@
 
                                                                                                         ],
                                                                                             "booleanActions":  0,
-                                                                                            "policyType":  76,
+                                                                                            "policyType":  77,
                                                                                             "enabled":  true
                                                                                         },
                                                                                         {
@@ -932,7 +937,7 @@
 
                                                                                                         ],
                                                                                             "booleanActions":  0,
-                                                                                            "policyType":  76,
+                                                                                            "policyType":  77,
                                                                                             "enabled":  true
                                                                                         },
                                                                                         {
@@ -948,7 +953,7 @@
 
                                                                                                         ],
                                                                                             "booleanActions":  0,
-                                                                                            "policyType":  76,
+                                                                                            "policyType":  77,
                                                                                             "enabled":  true
                                                                                         },
                                                                                         {
@@ -964,7 +969,7 @@
 
                                                                                                         ],
                                                                                             "booleanActions":  0,
-                                                                                            "policyType":  76,
+                                                                                            "policyType":  77,
                                                                                             "enabled":  true
                                                                                         },
                                                                                         {
@@ -982,7 +987,7 @@
                                                                                                         ],
                                                                                             "entityKey":  "defenderExploitProtectionXml",
                                                                                             "booleanActions":  0,
-                                                                                            "policyType":  76,
+                                                                                            "policyType":  77,
                                                                                             "enabled":  true
                                                                                         },
                                                                                         {
@@ -999,7 +1004,7 @@
                                                                                             "entityKey":  "defenderSecurityCenterBlockExploitProtectionOverride",
                                                                                             "booleanActions":  3,
                                                                                             "unconfiguredValue":  false,
-                                                                                            "policyType":  76,
+                                                                                            "policyType":  77,
                                                                                             "enabled":  true
                                                                                         }
                                                                                     ],
@@ -1013,7 +1018,7 @@
 
                                                                              ],
                                                                  "booleanActions":  0,
-                                                                 "policyType":  76,
+                                                                 "policyType":  77,
                                                                  "enabled":  true
                                                              }
                                                          ]

Documentation/ObjectInfo/defenderfirewall_windows10endpointprotection.json

@@ -13,7 +13,7 @@
 
                                                                          ],
                                                              "booleanActions":  0,
-                                                             "policyType":  76,
+                                                             "policyType":  77,
                                                              "enabled":  true
                                                          },
                                                          {
@@ -29,7 +29,7 @@
 
                                                                          ],
                                                              "booleanActions":  0,
-                                                             "policyType":  76,
+                                                             "policyType":  77,
                                                              "enabled":  true
                                                          },
                                                          {
@@ -58,7 +58,7 @@
                                                                          ],
                                                              "entityKey":  "firewallBlockStatefulFTP",
                                                              "booleanActions":  0,
-                                                             "policyType":  76,
+                                                             "policyType":  77,
                                                              "enabled":  true
                                                          },
                                                          {
@@ -75,7 +75,7 @@
                                                                          ],
                                                              "entityKey":  "firewallIdleTimeoutForSecurityAssociationInSeconds",
                                                              "booleanActions":  0,
-                                                             "policyType":  76,
+                                                             "policyType":  77,
                                                              "enabled":  true
                                                          },
                                                          {
@@ -92,7 +92,7 @@
                                                              "entityKey":  "firewallSyntheticPresharedKeyEncodingMethod",
                                                              "booleanActions":  2,
                                                              "unconfiguredValue":  false,
-                                                             "policyType":  76,
+                                                             "policyType":  77,
                                                              "enabled":  true
                                                          },
                                                          {
@@ -132,7 +132,7 @@
                                                                          ],
                                                              "entityKey":  "firewallSyntheticIPsecExemptions",
                                                              "booleanActions":  0,
-                                                             "policyType":  76,
+                                                             "policyType":  77,
                                                              "enabled":  true
                                                          },
                                                          {
@@ -169,7 +169,7 @@
                                                              "booleanActions":  0,
                                                              "defaultValue":  "deviceDefault",
                                                              "unconfiguredValue":  "deviceDefault",
-                                                             "policyType":  76,
+                                                             "policyType":  77,
                                                              "enabled":  true
                                                          },
                                                          {
@@ -198,7 +198,7 @@
                                                                          ],
                                                              "entityKey":  "firewallMergeKeyingModuleSettings",
                                                              "booleanActions":  0,
-                                                             "policyType":  76,
+                                                             "policyType":  77,
                                                              "enabled":  true
                                                          },
                                                          {
@@ -240,7 +240,7 @@
                                                              "booleanActions":  0,
                                                              "defaultValue":  "deviceDefault",
                                                              "unconfiguredValue":  "deviceDefault",
-                                                             "policyType":  76,
+                                                             "policyType":  77,
                                                              "enabled":  true
                                                          },
                                                          {
@@ -256,7 +256,7 @@
 
                                                                          ],
                                                              "booleanActions":  0,
-                                                             "policyType":  76,
+                                                             "policyType":  77,
                                                              "enabled":  true
                                                          },
                                                          {
@@ -272,7 +272,7 @@
 
                                                                          ],
                                                              "booleanActions":  0,
-                                                             "policyType":  76,
+                                                             "policyType":  77,
                                                              "enabled":  true
                                                          },
                                                          {
@@ -294,7 +294,7 @@
 
                                                                                                                               ],
                                                                                                                   "booleanActions":  0,
-                                                                                                                  "policyType":  76,
+                                                                                                                  "policyType":  77,
                                                                                                                   "enabled":  true
                                                                                                               },
                                                                                                               {
@@ -338,7 +338,7 @@
                                                                                                                                                                       "booleanActions":  0,
                                                                                                                                                                       "defaultValue":  "notConfigured",
                                                                                                                                                                       "unconfiguredValue":  "notConfigured",
-                                                                                                                                                                      "policyType":  76,
+                                                                                                                                                                      "policyType":  77,
                                                                                                                                                                       "enabled":  true
                                                                                                                                                                   }
                                                                                                                                                               ],
@@ -363,7 +363,7 @@
                                                                                                                                             "booleanActions":  0,
                                                                                                                                             "defaultValue":  "notConfigured",
                                                                                                                                             "unconfiguredValue":  "notConfigured",
-                                                                                                                                            "policyType":  76,
+                                                                                                                                            "policyType":  77,
                                                                                                                                             "enabled":  true
                                                                                                                                         },
                                                                                                                                         {
@@ -395,7 +395,7 @@
                                                                                                                                             "booleanActions":  0,
                                                                                                                                             "defaultValue":  "notConfigured",
                                                                                                                                             "unconfiguredValue":  "notConfigured",
-                                                                                                                                            "policyType":  76,
+                                                                                                                                            "policyType":  77,
                                                                                                                                             "enabled":  true
                                                                                                                                         },
                                                                                                                                         {
@@ -427,7 +427,7 @@
                                                                                                                                             "booleanActions":  0,
                                                                                                                                             "defaultValue":  "notConfigured",
                                                                                                                                             "unconfiguredValue":  "notConfigured",
-                                                                                                                                            "policyType":  76,
+                                                                                                                                            "policyType":  77,
                                                                                                                                             "enabled":  true
                                                                                                                                         },
                                                                                                                                         {
@@ -459,7 +459,7 @@
                                                                                                                                             "booleanActions":  0,
                                                                                                                                             "defaultValue":  "notConfigured",
                                                                                                                                             "unconfiguredValue":  "notConfigured",
-                                                                                                                                            "policyType":  76,
+                                                                                                                                            "policyType":  77,
                                                                                                                                             "enabled":  true
                                                                                                                                         },
                                                                                                                                         {
@@ -491,7 +491,7 @@
                                                                                                                                             "booleanActions":  0,
                                                                                                                                             "defaultValue":  "notConfigured",
                                                                                                                                             "unconfiguredValue":  "notConfigured",
-                                                                                                                                            "policyType":  76,
+                                                                                                                                            "policyType":  77,
                                                                                                                                             "enabled":  true
                                                                                                                                         },
                                                                                                                                         {
@@ -523,7 +523,7 @@
                                                                                                                                             "booleanActions":  0,
                                                                                                                                             "defaultValue":  "notConfigured",
                                                                                                                                             "unconfiguredValue":  "notConfigured",
-                                                                                                                                            "policyType":  76,
+                                                                                                                                            "policyType":  77,
                                                                                                                                             "enabled":  true
                                                                                                                                         },
                                                                                                                                         {
@@ -539,7 +539,7 @@
 
                                                                                                                                                         ],
                                                                                                                                             "booleanActions":  0,
-                                                                                                                                            "policyType":  76,
+                                                                                                                                            "policyType":  77,
                                                                                                                                             "enabled":  true
                                                                                                                                         },
                                                                                                                                         {
@@ -571,7 +571,7 @@
                                                                                                                                             "booleanActions":  0,
                                                                                                                                             "defaultValue":  "notConfigured",
                                                                                                                                             "unconfiguredValue":  "notConfigured",
-                                                                                                                                            "policyType":  76,
+                                                                                                                                            "policyType":  77,
                                                                                                                                             "enabled":  true
                                                                                                                                         },
                                                                                                                                         {
@@ -603,7 +603,7 @@
                                                                                                                                             "booleanActions":  0,
                                                                                                                                             "defaultValue":  "notConfigured",
                                                                                                                                             "unconfiguredValue":  "notConfigured",
-                                                                                                                                            "policyType":  76,
+                                                                                                                                            "policyType":  77,
                                                                                                                                             "enabled":  true
                                                                                                                                         },
                                                                                                                                         {
@@ -635,7 +635,7 @@
                                                                                                                                             "booleanActions":  0,
                                                                                                                                             "defaultValue":  "notConfigured",
                                                                                                                                             "unconfiguredValue":  "notConfigured",
-                                                                                                                                            "policyType":  76,
+                                                                                                                                            "policyType":  77,
                                                                                                                                             "enabled":  true
                                                                                                                                         },
                                                                                                                                         {
@@ -667,7 +667,7 @@
                                                                                                                                             "booleanActions":  0,
                                                                                                                                             "defaultValue":  "notConfigured",
                                                                                                                                             "unconfiguredValue":  "notConfigured",
-                                                                                                                                            "policyType":  76,
+                                                                                                                                            "policyType":  77,
                                                                                                                                             "enabled":  true
                                                                                                                                         }
                                                                                                                                     ],
@@ -677,7 +677,7 @@
                                                                                                                   "entityKey":  "firewallSyntheticProfileDomainfirewallEnabled",
                                                                                                                   "booleanActions":  2,
                                                                                                                   "unconfiguredValue":  false,
-                                                                                                                  "policyType":  76,
+                                                                                                                  "policyType":  77,
                                                                                                                   "enabled":  true
                                                                                                               }
                                                                                                           ],
@@ -691,7 +691,7 @@
 
                                                                                                    ],
                                                                                        "booleanActions":  0,
-                                                                                       "policyType":  76,
+                                                                                       "policyType":  77,
                                                                                        "enabled":  true
                                                                                    },
                                                                                    {
@@ -709,7 +709,7 @@
 
                                                                                                                               ],
                                                                                                                   "booleanActions":  0,
-                                                                                                                  "policyType":  76,
+                                                                                                                  "policyType":  77,
                                                                                                                   "enabled":  true
                                                                                                               },
                                                                                                               {
@@ -753,7 +753,7 @@
                                                                                                                                                                       "booleanActions":  0,
                                                                                                                                                                       "defaultValue":  "notConfigured",
                                                                                                                                                                       "unconfiguredValue":  "notConfigured",
-                                                                                                                                                                      "policyType":  76,
+                                                                                                                                                                      "policyType":  77,
                                                                                                                                                                       "enabled":  true
                                                                                                                                                                   }
                                                                                                                                                               ],
@@ -778,7 +778,7 @@
                                                                                                                                             "booleanActions":  0,
                                                                                                                                             "defaultValue":  "notConfigured",
                                                                                                                                             "unconfiguredValue":  "notConfigured",
-                                                                                                                                            "policyType":  76,
+                                                                                                                                            "policyType":  77,
                                                                                                                                             "enabled":  true
                                                                                                                                         },
                                                                                                                                         {
@@ -810,7 +810,7 @@
                                                                                                                                             "booleanActions":  0,
                                                                                                                                             "defaultValue":  "notConfigured",
                                                                                                                                             "unconfiguredValue":  "notConfigured",
-                                                                                                                                            "policyType":  76,
+                                                                                                                                            "policyType":  77,
                                                                                                                                             "enabled":  true
                                                                                                                                         },
                                                                                                                                         {
@@ -842,7 +842,7 @@
                                                                                                                                             "booleanActions":  0,
                                                                                                                                             "defaultValue":  "notConfigured",
                                                                                                                                             "unconfiguredValue":  "notConfigured",
-                                                                                                                                            "policyType":  76,
+                                                                                                                                            "policyType":  77,
                                                                                                                                             "enabled":  true
                                                                                                                                         },
                                                                                                                                         {
@@ -874,7 +874,7 @@
                                                                                                                                             "booleanActions":  0,
                                                                                                                                             "defaultValue":  "notConfigured",
                                                                                                                                             "unconfiguredValue":  "notConfigured",
-                                                                                                                                            "policyType":  76,
+                                                                                                                                            "policyType":  77,
                                                                                                                                             "enabled":  true
                                                                                                                                         },
                                                                                                                                         {
@@ -906,7 +906,7 @@
                                                                                                                                             "booleanActions":  0,
                                                                                                                                             "defaultValue":  "notConfigured",
                                                                                                                                             "unconfiguredValue":  "notConfigured",
-                                                                                                                                            "policyType":  76,
+                                                                                                                                            "policyType":  77,
                                                                                                                                             "enabled":  true
                                                                                                                                         },
                                                                                                                                         {
@@ -938,7 +938,7 @@
                                                                                                                                             "booleanActions":  0,
                                                                                                                                             "defaultValue":  "notConfigured",
                                                                                                                                             "unconfiguredValue":  "notConfigured",
-                                                                                                                                            "policyType":  76,
+                                                                                                                                            "policyType":  77,
                                                                                                                                             "enabled":  true
                                                                                                                                         },
                                                                                                                                         {
@@ -954,7 +954,7 @@
 
                                                                                                                                                         ],
                                                                                                                                             "booleanActions":  0,
-                                                                                                                                            "policyType":  76,
+                                                                                                                                            "policyType":  77,
                                                                                                                                             "enabled":  true
                                                                                                                                         },
                                                                                                                                         {
@@ -986,7 +986,7 @@
                                                                                                                                             "booleanActions":  0,
                                                                                                                                             "defaultValue":  "notConfigured",
                                                                                                                                             "unconfiguredValue":  "notConfigured",
-                                                                                                                                            "policyType":  76,
+                                                                                                                                            "policyType":  77,
                                                                                                                                             "enabled":  true
                                                                                                                                         },
                                                                                                                                         {
@@ -1018,7 +1018,7 @@
                                                                                                                                             "booleanActions":  0,
                                                                                                                                             "defaultValue":  "notConfigured",
                                                                                                                                             "unconfiguredValue":  "notConfigured",
-                                                                                                                                            "policyType":  76,
+                                                                                                                                            "policyType":  77,
                                                                                                                                             "enabled":  true
                                                                                                                                         },
                                                                                                                                         {
@@ -1050,7 +1050,7 @@
                                                                                                                                             "booleanActions":  0,
                                                                                                                                             "defaultValue":  "notConfigured",
                                                                                                                                             "unconfiguredValue":  "notConfigured",
-                                                                                                                                            "policyType":  76,
+                                                                                                                                            "policyType":  77,
                                                                                                                                             "enabled":  true
                                                                                                                                         },
                                                                                                                                         {
@@ -1082,7 +1082,7 @@
                                                                                                                                             "booleanActions":  0,
                                                                                                                                             "defaultValue":  "notConfigured",
                                                                                                                                             "unconfiguredValue":  "notConfigured",
-                                                                                                                                            "policyType":  76,
+                                                                                                                                            "policyType":  77,
                                                                                                                                             "enabled":  true
                                                                                                                                         }
                                                                                                                                     ],
@@ -1092,7 +1092,7 @@
                                                                                                                   "entityKey":  "firewallSyntheticProfilePrivatefirewallEnabled",
                                                                                                                   "booleanActions":  2,
                                                                                                                   "unconfiguredValue":  false,
-                                                                                                                  "policyType":  76,
+                                                                                                                  "policyType":  77,
                                                                                                                   "enabled":  true
                                                                                                               }
                                                                                                           ],
@@ -1106,7 +1106,7 @@
 
                                                                                                    ],
                                                                                        "booleanActions":  0,
-                                                                                       "policyType":  76,
+                                                                                       "policyType":  77,
                                                                                        "enabled":  true
                                                                                    },
                                                                                    {
@@ -1124,7 +1124,7 @@
 
                                                                                                                               ],
                                                                                                                   "booleanActions":  0,
-                                                                                                                  "policyType":  76,
+                                                                                                                  "policyType":  77,
                                                                                                                   "enabled":  true
                                                                                                               },
                                                                                                               {
@@ -1168,7 +1168,7 @@
                                                                                                                                                                       "booleanActions":  0,
                                                                                                                                                                       "defaultValue":  "notConfigured",
                                                                                                                                                                       "unconfiguredValue":  "notConfigured",
-                                                                                                                                                                      "policyType":  76,
+                                                                                                                                                                      "policyType":  77,
                                                                                                                                                                       "enabled":  true
                                                                                                                                                                   }
                                                                                                                                                               ],
@@ -1193,7 +1193,7 @@
                                                                                                                                             "booleanActions":  0,
                                                                                                                                             "defaultValue":  "notConfigured",
                                                                                                                                             "unconfiguredValue":  "notConfigured",
-                                                                                                                                            "policyType":  76,
+                                                                                                                                            "policyType":  77,
                                                                                                                                             "enabled":  true
                                                                                                                                         },
                                                                                                                                         {
@@ -1225,7 +1225,7 @@
                                                                                                                                             "booleanActions":  0,
                                                                                                                                             "defaultValue":  "notConfigured",
                                                                                                                                             "unconfiguredValue":  "notConfigured",
-                                                                                                                                            "policyType":  76,
+                                                                                                                                            "policyType":  77,
                                                                                                                                             "enabled":  true
                                                                                                                                         },
                                                                                                                                         {
@@ -1257,7 +1257,7 @@
                                                                                                                                             "booleanActions":  0,
                                                                                                                                             "defaultValue":  "notConfigured",
                                                                                                                                             "unconfiguredValue":  "notConfigured",
-                                                                                                                                            "policyType":  76,
+                                                                                                                                            "policyType":  77,
                                                                                                                                             "enabled":  true
                                                                                                                                         },
                                                                                                                                         {
@@ -1289,7 +1289,7 @@
                                                                                                                                             "booleanActions":  0,
                                                                                                                                             "defaultValue":  "notConfigured",
                                                                                                                                             "unconfiguredValue":  "notConfigured",
-                                                                                                                                            "policyType":  76,
+                                                                                                                                            "policyType":  77,
                                                                                                                                             "enabled":  true
                                                                                                                                         },
                                                                                                                                         {
@@ -1321,7 +1321,7 @@
                                                                                                                                             "booleanActions":  0,
                                                                                                                                             "defaultValue":  "notConfigured",
                                                                                                                                             "unconfiguredValue":  "notConfigured",
-                                                                                                                                            "policyType":  76,
+                                                                                                                                            "policyType":  77,
                                                                                                                                             "enabled":  true
                                                                                                                                         },
                                                                                                                                         {
@@ -1353,7 +1353,7 @@
                                                                                                                                             "booleanActions":  0,
                                                                                                                                             "defaultValue":  "notConfigured",
                                                                                                                                             "unconfiguredValue":  "notConfigured",
-                                                                                                                                            "policyType":  76,
+                                                                                                                                            "policyType":  77,
                                                                                                                                             "enabled":  true
                                                                                                                                         },
                                                                                                                                         {
@@ -1369,7 +1369,7 @@
 
                                                                                                                                                         ],
                                                                                                                                             "booleanActions":  0,
-                                                                                                                                            "policyType":  76,
+                                                                                                                                            "policyType":  77,
                                                                                                                                             "enabled":  true
                                                                                                                                         },
                                                                                                                                         {
@@ -1401,7 +1401,7 @@
                                                                                                                                             "booleanActions":  0,
                                                                                                                                             "defaultValue":  "notConfigured",
                                                                                                                                             "unconfiguredValue":  "notConfigured",
-                                                                                                                                            "policyType":  76,
+                                                                                                                                            "policyType":  77,
                                                                                                                                             "enabled":  true
                                                                                                                                         },
                                                                                                                                         {
@@ -1433,7 +1433,7 @@
                                                                                                                                             "booleanActions":  0,
                                                                                                                                             "defaultValue":  "notConfigured",
                                                                                                                                             "unconfiguredValue":  "notConfigured",
-                                                                                                                                            "policyType":  76,
+                                                                                                                                            "policyType":  77,
                                                                                                                                             "enabled":  true
                                                                                                                                         },
                                                                                                                                         {
@@ -1465,7 +1465,7 @@
                                                                                                                                             "booleanActions":  0,
                                                                                                                                             "defaultValue":  "notConfigured",
                                                                                                                                             "unconfiguredValue":  "notConfigured",
-                                                                                                                                            "policyType":  76,
+                                                                                                                                            "policyType":  77,
                                                                                                                                             "enabled":  true
                                                                                                                                         },
                                                                                                                                         {
@@ -1497,7 +1497,7 @@
                                                                                                                                             "booleanActions":  0,
                                                                                                                                             "defaultValue":  "notConfigured",
                                                                                                                                             "unconfiguredValue":  "notConfigured",
-                                                                                                                                            "policyType":  76,
+                                                                                                                                            "policyType":  77,
                                                                                                                                             "enabled":  true
                                                                                                                                         }
                                                                                                                                     ],
@@ -1507,7 +1507,7 @@
                                                                                                                   "entityKey":  "firewallSyntheticProfilePublicfirewallEnabled",
                                                                                                                   "booleanActions":  2,
                                                                                                                   "unconfiguredValue":  false,
-                                                                                                                  "policyType":  76,
+                                                                                                                  "policyType":  77,
                                                                                                                   "enabled":  true
                                                                                                               }
                                                                                                           ],
@@ -1521,7 +1521,7 @@
 
                                                                                                    ],
                                                                                        "booleanActions":  0,
-                                                                                       "policyType":  76,
+                                                                                       "policyType":  77,
                                                                                        "enabled":  true
                                                                                    }
                                                                                ],
@@ -1529,7 +1529,7 @@
 
                                                                          ],
                                                              "booleanActions":  0,
-                                                             "policyType":  76,
+                                                             "policyType":  77,
                                                              "enabled":  true
                                                          },
                                                          {
@@ -1545,7 +1545,7 @@
 
                                                                          ],
                                                              "booleanActions":  0,
-                                                             "policyType":  76,
+                                                             "policyType":  77,
                                                              "enabled":  false
                                                          },
                                                          {
@@ -1561,7 +1561,7 @@
 
                                                                          ],
                                                              "booleanActions":  0,
-                                                             "policyType":  76,
+                                                             "policyType":  77,
                                                              "enabled":  false
                                                          },
                                                          {
@@ -1581,7 +1581,7 @@
                                                                                                               ],
                                                                                                   "entityKey":  "displayName",
                                                                                                   "booleanActions":  0,
-                                                                                                  "policyType":  76,
+                                                                                                  "policyType":  77,
                                                                                                   "enabled":  false
                                                                                               }
                                                                              },
@@ -1600,7 +1600,7 @@
                                                                                                               ],
                                                                                                   "entityKey":  "description",
                                                                                                   "booleanActions":  0,
-                                                                                                  "policyType":  76,
+                                                                                                  "policyType":  77,
                                                                                                   "enabled":  false
                                                                                               }
                                                                              },
@@ -1633,7 +1633,7 @@
                                                                                                   "entityKey":  "trafficDirection",
                                                                                                   "booleanActions":  0,
                                                                                                   "defaultValue":  "notConfigured",
-                                                                                                  "policyType":  76,
+                                                                                                  "policyType":  77,
                                                                                                   "enabled":  false
                                                                                               }
                                                                              },
@@ -1666,7 +1666,7 @@
                                                                                                   "entityKey":  "action",
                                                                                                   "booleanActions":  0,
                                                                                                   "defaultValue":  "notConfigured",
-                                                                                                  "policyType":  76,
+                                                                                                  "policyType":  77,
                                                                                                   "enabled":  false
                                                                                               }
                                                                              },
@@ -1699,7 +1699,7 @@
                                                                                                   "entityKey":  "profileTypes",
                                                                                                   "booleanActions":  0,
                                                                                                   "defaultValue":  "notConfigured",
-                                                                                                  "policyType":  76,
+                                                                                                  "policyType":  77,
                                                                                                   "enabled":  false
                                                                                               }
                                                                              },
@@ -1717,7 +1717,7 @@
 
                                                                                                               ],
                                                                                                   "booleanActions":  0,
-                                                                                                  "policyType":  76,
+                                                                                                  "policyType":  77,
                                                                                                   "enabled":  false
                                                                                               }
                                                                              },
@@ -1735,7 +1735,7 @@
 
                                                                                                               ],
                                                                                                   "booleanActions":  0,
-                                                                                                  "policyType":  76,
+                                                                                                  "policyType":  77,
                                                                                                   "enabled":  false
                                                                                               }
                                                                              },
@@ -1772,7 +1772,7 @@
                                                                                                                                                        ],
                                                                                                                                            "entityKey":  "packageFamilyName",
                                                                                                                                            "booleanActions":  0,
-                                                                                                                                           "policyType":  76,
+                                                                                                                                           "policyType":  77,
                                                                                                                                            "enabled":  false
                                                                                                                                        }
                                                                                                                                    ],
@@ -1796,7 +1796,7 @@
                                                                                                                                                        ],
                                                                                                                                            "entityKey":  "filePath",
                                                                                                                                            "booleanActions":  0,
-                                                                                                                                           "policyType":  76,
+                                                                                                                                           "policyType":  77,
                                                                                                                                            "enabled":  false
                                                                                                                                        }
                                                                                                                                    ],
@@ -1820,7 +1820,7 @@
                                                                                                                                                        ],
                                                                                                                                            "entityKey":  "serviceName",
                                                                                                                                            "booleanActions":  0,
-                                                                                                                                           "policyType":  76,
+                                                                                                                                           "policyType":  77,
                                                                                                                                            "enabled":  false
                                                                                                                                        }
                                                                                                                                    ],
@@ -1830,7 +1830,7 @@
                                                                                                   "entityKey":  "firewallRuleSyntheticApplicationKey",
                                                                                                   "booleanActions":  0,
                                                                                                   "defaultValue":  "all",
-                                                                                                  "policyType":  76,
+                                                                                                  "policyType":  77,
                                                                                                   "enabled":  false
                                                                                               }
                                                                              },
@@ -1848,7 +1848,7 @@
 
                                                                                                               ],
                                                                                                   "booleanActions":  0,
-                                                                                                  "policyType":  76,
+                                                                                                  "policyType":  77,
                                                                                                   "enabled":  false
                                                                                               }
                                                                              },
@@ -1866,7 +1866,7 @@
 
                                                                                                               ],
                                                                                                   "booleanActions":  0,
-                                                                                                  "policyType":  76,
+                                                                                                  "policyType":  77,
                                                                                                   "enabled":  false
                                                                                               }
                                                                              },
@@ -1902,7 +1902,7 @@
                                                                                                                                                        ],
                                                                                                                                            "entityKey":  "localAddressRanges",
                                                                                                                                            "booleanActions":  0,
-                                                                                                                                           "policyType":  76,
+                                                                                                                                           "policyType":  77,
                                                                                                                                            "enabled":  false
                                                                                                                                        }
                                                                                                                                    ],
@@ -1912,7 +1912,7 @@
                                                                                                   "entityKey":  "firewallRuleSyntheticLocalAddressesKey",
                                                                                                   "booleanActions":  0,
                                                                                                   "defaultValue":  "all",
-                                                                                                  "policyType":  76,
+                                                                                                  "policyType":  77,
                                                                                                   "enabled":  false
                                                                                               }
                                                                              },
@@ -1948,7 +1948,7 @@
                                                                                                                                                        ],
                                                                                                                                            "entityKey":  "remoteAddressRanges",
                                                                                                                                            "booleanActions":  0,
-                                                                                                                                           "policyType":  76,
+                                                                                                                                           "policyType":  77,
                                                                                                                                            "enabled":  false
                                                                                                                                        }
                                                                                                                                    ],
@@ -1958,7 +1958,7 @@
                                                                                                   "entityKey":  "firewallRuleSyntheticRemoteAddressesKey",
                                                                                                   "booleanActions":  0,
                                                                                                   "defaultValue":  "all",
-                                                                                                  "policyType":  76,
+                                                                                                  "policyType":  77,
                                                                                                   "enabled":  false
                                                                                               }
                                                                              },
@@ -1976,7 +1976,7 @@
 
                                                                                                               ],
                                                                                                   "booleanActions":  0,
-                                                                                                  "policyType":  76,
+                                                                                                  "policyType":  77,
                                                                                                   "enabled":  false
                                                                                               }
                                                                              },
@@ -1994,7 +1994,7 @@
 
                                                                                                               ],
                                                                                                   "booleanActions":  0,
-                                                                                                  "policyType":  76,
+                                                                                                  "policyType":  77,
                                                                                                   "enabled":  false
                                                                                               }
                                                                              },
@@ -2048,7 +2048,7 @@
                                                                                                                                                                                                 ],
                                                                                                                                                                                     "entityKey":  "localPortRanges",
                                                                                                                                                                                     "booleanActions":  0,
-                                                                                                                                                                                    "policyType":  76,
+                                                                                                                                                                                    "policyType":  77,
                                                                                                                                                                                     "enabled":  false
                                                                                                                                                                                 }
                                                                                                                                                                             ],
@@ -2058,7 +2058,7 @@
                                                                                                                                            "entityKey":  "firewallRuleSyntheticLocalPortsKey",
                                                                                                                                            "booleanActions":  0,
                                                                                                                                            "defaultValue":  "all",
-                                                                                                                                           "policyType":  76,
+                                                                                                                                           "policyType":  77,
                                                                                                                                            "enabled":  false
                                                                                                                                        },
                                                                                                                                        {
@@ -2092,7 +2092,7 @@
                                                                                                                                                                                                 ],
                                                                                                                                                                                     "entityKey":  "remotePortRanges",
                                                                                                                                                                                     "booleanActions":  0,
-                                                                                                                                                                                    "policyType":  76,
+                                                                                                                                                                                    "policyType":  77,
                                                                                                                                                                                     "enabled":  false
                                                                                                                                                                                 }
                                                                                                                                                                             ],
@@ -2102,7 +2102,7 @@
                                                                                                                                            "entityKey":  "firewallRuleSyntheticRemotePortsKey",
                                                                                                                                            "booleanActions":  0,
                                                                                                                                            "defaultValue":  "all",
-                                                                                                                                           "policyType":  76,
+                                                                                                                                           "policyType":  77,
                                                                                                                                            "enabled":  false
                                                                                                                                        }
                                                                                                                                    ],
@@ -2143,7 +2143,7 @@
                                                                                                                                                                                                 ],
                                                                                                                                                                                     "entityKey":  "localPortRanges",
                                                                                                                                                                                     "booleanActions":  0,
-                                                                                                                                                                                    "policyType":  76,
+                                                                                                                                                                                    "policyType":  77,
                                                                                                                                                                                     "enabled":  false
                                                                                                                                                                                 }
                                                                                                                                                                             ],
@@ -2153,7 +2153,7 @@
                                                                                                                                            "entityKey":  "firewallRuleSyntheticLocalPortsKey",
                                                                                                                                            "booleanActions":  0,
                                                                                                                                            "defaultValue":  "all",
-                                                                                                                                           "policyType":  76,
+                                                                                                                                           "policyType":  77,
                                                                                                                                            "enabled":  false
                                                                                                                                        },
                                                                                                                                        {
@@ -2187,7 +2187,7 @@
                                                                                                                                                                                                 ],
                                                                                                                                                                                     "entityKey":  "remotePortRanges",
                                                                                                                                                                                     "booleanActions":  0,
-                                                                                                                                                                                    "policyType":  76,
+                                                                                                                                                                                    "policyType":  77,
                                                                                                                                                                                     "enabled":  false
                                                                                                                                                                                 }
                                                                                                                                                                             ],
@@ -2197,7 +2197,7 @@
                                                                                                                                            "entityKey":  "firewallRuleSyntheticRemotePortsKey",
                                                                                                                                            "booleanActions":  0,
                                                                                                                                            "defaultValue":  "all",
-                                                                                                                                           "policyType":  76,
+                                                                                                                                           "policyType":  77,
                                                                                                                                            "enabled":  false
                                                                                                                                        }
                                                                                                                                    ],
@@ -2220,7 +2220,7 @@
                                                                                                                                                        ],
                                                                                                                                            "entityKey":  "protocol",
                                                                                                                                            "booleanActions":  0,
-                                                                                                                                           "policyType":  76,
+                                                                                                                                           "policyType":  77,
                                                                                                                                            "enabled":  false
                                                                                                                                        }
                                                                                                                                    ],
@@ -2230,7 +2230,7 @@
                                                                                                   "entityKey":  "firewallRuleSyntheticProtocolKey",
                                                                                                   "booleanActions":  0,
                                                                                                   "defaultValue":  "any",
-                                                                                                  "policyType":  76,
+                                                                                                  "policyType":  77,
                                                                                                   "enabled":  false
                                                                                               }
                                                                              },
@@ -2248,7 +2248,7 @@
 
                                                                                                               ],
                                                                                                   "booleanActions":  0,
-                                                                                                  "policyType":  76,
+                                                                                                  "policyType":  77,
                                                                                                   "enabled":  false
                                                                                               }
                                                                              },
@@ -2281,7 +2281,7 @@
                                                                                                   "entityKey":  "interfaceTypes",
                                                                                                   "booleanActions":  0,
                                                                                                   "defaultValue":  "notConfigured",
-                                                                                                  "policyType":  76,
+                                                                                                  "policyType":  77,
                                                                                                   "enabled":  false
                                                                                               }
                                                                              },
@@ -2299,7 +2299,7 @@
 
                                                                                                               ],
                                                                                                   "booleanActions":  0,
-                                                                                                  "policyType":  76,
+                                                                                                  "policyType":  77,
                                                                                                   "enabled":  false
                                                                                               }
                                                                              },
@@ -2318,7 +2318,7 @@
                                                                                                               ],
                                                                                                   "entityKey":  "localUserAuthorizations",
                                                                                                   "booleanActions":  0,
-                                                                                                  "policyType":  76,
+                                                                                                  "policyType":  77,
                                                                                                   "enabled":  false
                                                                                               }
                                                                              }
@@ -2334,7 +2334,7 @@
                                                                          ],
                                                              "entityKey":  "firewallRules",
                                                              "booleanActions":  0,
-                                                             "policyType":  76,
+                                                             "policyType":  77,
                                                              "enabled":  false
                                                          }
                                                      ]

Documentation/ObjectInfo/defenderlocalsecurityoptions_windows10endpointprotection.json

@@ -26,7 +26,7 @@
                                                                                                     "booleanActions":  0,
                                                                                                     "defaultValue":  false,
                                                                                                     "unconfiguredValue":  false,
-                                                                                                    "policyType":  76,
+                                                                                                    "policyType":  77,
                                                                                                     "enabled":  true
                                                                                                 },
                                                                                                 {
@@ -53,7 +53,7 @@
                                                                                                     "booleanActions":  0,
                                                                                                     "defaultValue":  false,
                                                                                                     "unconfiguredValue":  false,
-                                                                                                    "policyType":  76,
+                                                                                                    "policyType":  77,
                                                                                                     "enabled":  true
                                                                                                 },
                                                                                                 {
@@ -69,7 +69,7 @@
 
                                                                                                                 ],
                                                                                                     "booleanActions":  0,
-                                                                                                    "policyType":  76,
+                                                                                                    "policyType":  77,
                                                                                                     "enabled":  true
                                                                                                 },
                                                                                                 {
@@ -96,7 +96,7 @@
                                                                                                     "booleanActions":  0,
                                                                                                     "defaultValue":  false,
                                                                                                     "unconfiguredValue":  false,
-                                                                                                    "policyType":  76,
+                                                                                                    "policyType":  77,
                                                                                                     "enabled":  true
                                                                                                 },
                                                                                                 {
@@ -114,7 +114,7 @@
                                                                                                     "entityKey":  "localSecurityOptionsAdministratorAccountName",
                                                                                                     "booleanActions":  0,
                                                                                                     "defaultValue":  "",
-                                                                                                    "policyType":  76,
+                                                                                                    "policyType":  77,
                                                                                                     "enabled":  true
                                                                                                 },
                                                                                                 {
@@ -130,7 +130,7 @@
 
                                                                                                                 ],
                                                                                                     "booleanActions":  0,
-                                                                                                    "policyType":  76,
+                                                                                                    "policyType":  77,
                                                                                                     "enabled":  true
                                                                                                 },
                                                                                                 {
@@ -157,7 +157,7 @@
                                                                                                     "booleanActions":  0,
                                                                                                     "defaultValue":  false,
                                                                                                     "unconfiguredValue":  false,
-                                                                                                    "policyType":  76,
+                                                                                                    "policyType":  77,
                                                                                                     "enabled":  true
                                                                                                 },
                                                                                                 {
@@ -175,7 +175,7 @@
                                                                                                     "entityKey":  "localSecurityOptionsGuestAccountName",
                                                                                                     "booleanActions":  0,
                                                                                                     "defaultValue":  "",
-                                                                                                    "policyType":  76,
+                                                                                                    "policyType":  77,
                                                                                                     "enabled":  true
                                                                                                 }
                                                                                             ],
@@ -189,7 +189,7 @@
 
                                                                                      ],
                                                                          "booleanActions":  0,
-                                                                         "policyType":  76,
+                                                                         "policyType":  77,
                                                                          "enabled":  true
                                                                      },
                                                                      {
@@ -218,7 +218,7 @@
                                                                                                     "booleanActions":  0,
                                                                                                     "defaultValue":  false,
                                                                                                     "unconfiguredValue":  false,
-                                                                                                    "policyType":  76,
+                                                                                                    "policyType":  77,
                                                                                                     "enabled":  true
                                                                                                 },
                                                                                                 {
@@ -245,7 +245,7 @@
                                                                                                     "booleanActions":  0,
                                                                                                     "defaultValue":  false,
                                                                                                     "unconfiguredValue":  false,
-                                                                                                    "policyType":  76,
+                                                                                                    "policyType":  77,
                                                                                                     "enabled":  true
                                                                                                 },
                                                                                                 {
@@ -272,7 +272,7 @@
                                                                                                     "booleanActions":  0,
                                                                                                     "defaultValue":  false,
                                                                                                     "unconfiguredValue":  false,
-                                                                                                    "policyType":  76,
+                                                                                                    "policyType":  77,
                                                                                                     "enabled":  true
                                                                                                 },
                                                                                                 {
@@ -309,7 +309,7 @@
                                                                                                     "booleanActions":  0,
                                                                                                     "defaultValue":  "notConfigured",
                                                                                                     "unconfiguredValue":  "notConfigured",
-                                                                                                    "policyType":  76,
+                                                                                                    "policyType":  77,
                                                                                                     "enabled":  true
                                                                                                 }
                                                                                             ],
@@ -323,7 +323,7 @@
 
                                                                                      ],
                                                                          "booleanActions":  0,
-                                                                         "policyType":  76,
+                                                                         "policyType":  77,
                                                                          "enabled":  true
                                                                      },
                                                                      {
@@ -343,7 +343,7 @@
                                                                                                     "entityKey":  "localSecurityOptionsMachineInactivityLimitInMinutes",
                                                                                                     "booleanActions":  0,
                                                                                                     "defaultValue":  false,
-                                                                                                    "policyType":  76,
+                                                                                                    "policyType":  77,
                                                                                                     "enabled":  true
                                                                                                 },
                                                                                                 {
@@ -370,7 +370,7 @@
                                                                                                     "booleanActions":  0,
                                                                                                     "defaultValue":  false,
                                                                                                     "unconfiguredValue":  false,
-                                                                                                    "policyType":  76,
+                                                                                                    "policyType":  77,
                                                                                                     "enabled":  true
                                                                                                 },
                                                                                                 {
@@ -383,13 +383,13 @@
                                                                                                                       ],
                                                                                                     "options":  [
                                                                                                                     {
-                                                                                                                        "nameResourceKey":  "localSecurityOptionsSmartCardRemovalBehaviorLockWorkstation",
+                                                                                                                        "nameResourceKey":  "localSecurityOptionsSmartCardRemovalBehaviorNoAction",
-                                                                                                                        "value":  "lockWorkstation",
+                                                                                                                        "value":  "noAction",
                                                                                                                         "enabled":  true
                                                                                                                     },
                                                                                                                     {
-                                                                                                                        "nameResourceKey":  "localSecurityOptionsSmartCardRemovalBehaviorNoAction",
+                                                                                                                        "nameResourceKey":  "localSecurityOptionsSmartCardRemovalBehaviorLockWorkstation",
-                                                                                                                        "value":  "noAction",
+                                                                                                                        "value":  "lockWorkstation",
                                                                                                                         "enabled":  true
                                                                                                                     },
                                                                                                                     {
@@ -405,9 +405,9 @@
                                                                                                                 ],
                                                                                                     "entityKey":  "localSecurityOptionsSmartCardRemovalBehavior",
                                                                                                     "booleanActions":  0,
-                                                                                                    "defaultValue":  "lockWorkstation",
+                                                                                                    "defaultValue":  "noAction",
-                                                                                                    "unconfiguredValue":  "lockWorkstation",
+                                                                                                    "unconfiguredValue":  "noAction",
-                                                                                                    "policyType":  76,
+                                                                                                    "policyType":  77,
                                                                                                     "enabled":  true
                                                                                                 },
                                                                                                 {
@@ -423,7 +423,7 @@
 
                                                                                                                 ],
                                                                                                     "booleanActions":  0,
-                                                                                                    "policyType":  76,
+                                                                                                    "policyType":  77,
                                                                                                     "enabled":  true
                                                                                                 },
                                                                                                 {
@@ -460,7 +460,7 @@
                                                                                                     "booleanActions":  0,
                                                                                                     "defaultValue":  "notConfigured",
                                                                                                     "unconfiguredValue":  "notConfigured",
-                                                                                                    "policyType":  76,
+                                                                                                    "policyType":  77,
                                                                                                     "enabled":  true
                                                                                                 },
                                                                                                 {
@@ -487,7 +487,7 @@
                                                                                                     "booleanActions":  0,
                                                                                                     "defaultValue":  false,
                                                                                                     "unconfiguredValue":  false,
-                                                                                                    "policyType":  76,
+                                                                                                    "policyType":  77,
                                                                                                     "enabled":  true
                                                                                                 },
                                                                                                 {
@@ -514,7 +514,7 @@
                                                                                                     "booleanActions":  0,
                                                                                                     "defaultValue":  false,
                                                                                                     "unconfiguredValue":  false,
-                                                                                                    "policyType":  76,
+                                                                                                    "policyType":  77,
                                                                                                     "enabled":  true
                                                                                                 },
                                                                                                 {
@@ -532,7 +532,7 @@
                                                                                                     "entityKey":  "localSecurityOptionsLogOnMessageTitle",
                                                                                                     "booleanActions":  0,
                                                                                                     "defaultValue":  "",
-                                                                                                    "policyType":  76,
+                                                                                                    "policyType":  77,
                                                                                                     "enabled":  true
                                                                                                 },
                                                                                                 {
@@ -550,7 +550,7 @@
                                                                                                     "entityKey":  "localSecurityOptionsLogOnMessageText",
                                                                                                     "booleanActions":  0,
                                                                                                     "defaultValue":  "",
-                                                                                                    "policyType":  76,
+                                                                                                    "policyType":  77,
                                                                                                     "enabled":  true
                                                                                                 }
                                                                                             ],
@@ -564,7 +564,7 @@
 
                                                                                      ],
                                                                          "booleanActions":  0,
-                                                                         "policyType":  76,
+                                                                         "policyType":  77,
                                                                          "enabled":  true
                                                                      },
                                                                      {
@@ -593,7 +593,7 @@
                                                                                                     "booleanActions":  0,
                                                                                                     "defaultValue":  false,
                                                                                                     "unconfiguredValue":  false,
-                                                                                                    "policyType":  76,
+                                                                                                    "policyType":  77,
                                                                                                     "enabled":  true
                                                                                                 },
                                                                                                 {
@@ -620,7 +620,7 @@
                                                                                                     "booleanActions":  0,
                                                                                                     "defaultValue":  false,
                                                                                                     "unconfiguredValue":  false,
-                                                                                                    "policyType":  76,
+                                                                                                    "policyType":  77,
                                                                                                     "enabled":  true
                                                                                                 },
                                                                                                 {
@@ -647,7 +647,7 @@
                                                                                                     "booleanActions":  0,
                                                                                                     "defaultValue":  false,
                                                                                                     "unconfiguredValue":  false,
-                                                                                                    "policyType":  76,
+                                                                                                    "policyType":  77,
                                                                                                     "enabled":  true
                                                                                                 },
                                                                                                 {
@@ -674,7 +674,7 @@
                                                                                                     "booleanActions":  0,
                                                                                                     "defaultValue":  false,
                                                                                                     "unconfiguredValue":  false,
-                                                                                                    "policyType":  76,
+                                                                                                    "policyType":  77,
                                                                                                     "enabled":  true
                                                                                                 },
                                                                                                 {
@@ -701,7 +701,7 @@
                                                                                                     "booleanActions":  0,
                                                                                                     "defaultValue":  false,
                                                                                                     "unconfiguredValue":  false,
-                                                                                                    "policyType":  76,
+                                                                                                    "policyType":  77,
                                                                                                     "enabled":  true
                                                                                                 },
                                                                                                 {
@@ -724,7 +724,7 @@
                                                                                                                               "entityKey":  "localSecurityOptionsAllowRemoteCallsToSecurityAccountsManager",
                                                                                                                               "booleanActions":  0,
                                                                                                                               "defaultValue":  "",
-                                                                                                                              "policyType":  76,
+                                                                                                                              "policyType":  77,
                                                                                                                               "enabled":  true
                                                                                                                           }
                                                                                                                       ],
@@ -744,7 +744,7 @@
                                                                                                     "booleanActions":  0,
                                                                                                     "defaultValue":  false,
                                                                                                     "unconfiguredValue":  false,
-                                                                                                    "policyType":  76,
+                                                                                                    "policyType":  77,
                                                                                                     "enabled":  true
                                                                                                 },
                                                                                                 {
@@ -781,7 +781,7 @@
                                                                                                     "booleanActions":  0,
                                                                                                     "defaultValue":  "none",
                                                                                                     "unconfiguredValue":  "none",
-                                                                                                    "policyType":  76,
+                                                                                                    "policyType":  77,
                                                                                                     "enabled":  true
                                                                                                 },
                                                                                                 {
@@ -818,7 +818,7 @@
                                                                                                     "booleanActions":  0,
                                                                                                     "defaultValue":  "none",
                                                                                                     "unconfiguredValue":  "none",
-                                                                                                    "policyType":  76,
+                                                                                                    "policyType":  77,
                                                                                                     "enabled":  true
                                                                                                 },
                                                                                                 {
@@ -865,7 +865,7 @@
                                                                                                     "booleanActions":  0,
                                                                                                     "defaultValue":  "lmAndNltm",
                                                                                                     "unconfiguredValue":  "lmAndNltm",
-                                                                                                    "policyType":  76,
+                                                                                                    "policyType":  77,
                                                                                                     "enabled":  true
                                                                                                 },
                                                                                                 {
@@ -892,7 +892,7 @@
                                                                                                     "booleanActions":  0,
                                                                                                     "defaultValue":  false,
                                                                                                     "unconfiguredValue":  false,
-                                                                                                    "policyType":  76,
+                                                                                                    "policyType":  77,
                                                                                                     "enabled":  true
                                                                                                 }
                                                                                             ],
@@ -906,7 +906,7 @@
 
                                                                                      ],
                                                                          "booleanActions":  0,
-                                                                         "policyType":  76,
+                                                                         "policyType":  77,
                                                                          "enabled":  true
                                                                      },
                                                                      {
@@ -935,7 +935,7 @@
                                                                                                     "booleanActions":  0,
                                                                                                     "defaultValue":  false,
                                                                                                     "unconfiguredValue":  false,
-                                                                                                    "policyType":  76,
+                                                                                                    "policyType":  77,
                                                                                                     "enabled":  true
                                                                                                 },
                                                                                                 {
@@ -962,7 +962,7 @@
                                                                                                     "booleanActions":  0,
                                                                                                     "defaultValue":  false,
                                                                                                     "unconfiguredValue":  false,
-                                                                                                    "policyType":  76,
+                                                                                                    "policyType":  77,
                                                                                                     "enabled":  true
                                                                                                 }
                                                                                             ],
@@ -976,7 +976,7 @@
 
                                                                                      ],
                                                                          "booleanActions":  0,
-                                                                         "policyType":  76,
+                                                                         "policyType":  77,
                                                                          "enabled":  true
                                                                      },
                                                                      {
@@ -1005,7 +1005,7 @@
                                                                                                     "booleanActions":  0,
                                                                                                     "defaultValue":  false,
                                                                                                     "unconfiguredValue":  false,
-                                                                                                    "policyType":  76,
+                                                                                                    "policyType":  77,
                                                                                                     "enabled":  true
                                                                                                 },
                                                                                                 {
@@ -1032,7 +1032,7 @@
                                                                                                     "booleanActions":  0,
                                                                                                     "defaultValue":  false,
                                                                                                     "unconfiguredValue":  false,
-                                                                                                    "policyType":  76,
+                                                                                                    "policyType":  77,
                                                                                                     "enabled":  true
                                                                                                 },
                                                                                                 {
@@ -1059,7 +1059,7 @@
                                                                                                     "booleanActions":  0,
                                                                                                     "defaultValue":  false,
                                                                                                     "unconfiguredValue":  false,
-                                                                                                    "policyType":  76,
+                                                                                                    "policyType":  77,
                                                                                                     "enabled":  true
                                                                                                 },
                                                                                                 {
@@ -1075,7 +1075,7 @@
 
                                                                                                                 ],
                                                                                                     "booleanActions":  0,
-                                                                                                    "policyType":  76,
+                                                                                                    "policyType":  77,
                                                                                                     "enabled":  true
                                                                                                 },
                                                                                                 {
@@ -1127,7 +1127,7 @@
                                                                                                     "booleanActions":  0,
                                                                                                     "defaultValue":  "notConfigured",
                                                                                                     "unconfiguredValue":  "notConfigured",
-                                                                                                    "policyType":  76,
+                                                                                                    "policyType":  77,
                                                                                                     "enabled":  true
                                                                                                 },
                                                                                                 {
@@ -1164,7 +1164,7 @@
                                                                                                     "booleanActions":  0,
                                                                                                     "defaultValue":  "notConfigured",
                                                                                                     "unconfiguredValue":  "notConfigured",
-                                                                                                    "policyType":  76,
+                                                                                                    "policyType":  77,
                                                                                                     "enabled":  true
                                                                                                 },
                                                                                                 {
@@ -1191,7 +1191,7 @@
                                                                                                     "booleanActions":  0,
                                                                                                     "defaultValue":  false,
                                                                                                     "unconfiguredValue":  false,
-                                                                                                    "policyType":  76,
+                                                                                                    "policyType":  77,
                                                                                                     "enabled":  true
                                                                                                 },
                                                                                                 {
@@ -1218,7 +1218,7 @@
                                                                                                     "booleanActions":  0,
                                                                                                     "defaultValue":  false,
                                                                                                     "unconfiguredValue":  false,
-                                                                                                    "policyType":  76,
+                                                                                                    "policyType":  77,
                                                                                                     "enabled":  true
                                                                                                 },
                                                                                                 {
@@ -1245,7 +1245,7 @@
                                                                                                     "booleanActions":  0,
                                                                                                     "defaultValue":  false,
                                                                                                     "unconfiguredValue":  false,
-                                                                                                    "policyType":  76,
+                                                                                                    "policyType":  77,
                                                                                                     "enabled":  true
                                                                                                 },
                                                                                                 {
@@ -1261,7 +1261,7 @@
 
                                                                                                                 ],
                                                                                                     "booleanActions":  0,
-                                                                                                    "policyType":  76,
+                                                                                                    "policyType":  77,
                                                                                                     "enabled":  true
                                                                                                 },
                                                                                                 {
@@ -1288,7 +1288,7 @@
                                                                                                     "booleanActions":  0,
                                                                                                     "defaultValue":  false,
                                                                                                     "unconfiguredValue":  false,
-                                                                                                    "policyType":  76,
+                                                                                                    "policyType":  77,
                                                                                                     "enabled":  true
                                                                                                 },
                                                                                                 {
@@ -1315,7 +1315,7 @@
                                                                                                     "booleanActions":  0,
                                                                                                     "defaultValue":  false,
                                                                                                     "unconfiguredValue":  false,
-                                                                                                    "policyType":  76,
+                                                                                                    "policyType":  77,
                                                                                                     "enabled":  true
                                                                                                 }
                                                                                             ],
@@ -1329,7 +1329,7 @@
 
                                                                                      ],
                                                                          "booleanActions":  0,
-                                                                         "policyType":  76,
+                                                                         "policyType":  77,
                                                                          "enabled":  true
                                                                      },
                                                                      {
@@ -1358,7 +1358,7 @@
                                                                                                     "booleanActions":  0,
                                                                                                     "defaultValue":  false,
                                                                                                     "unconfiguredValue":  false,
-                                                                                                    "policyType":  76,
+                                                                                                    "policyType":  77,
                                                                                                     "enabled":  true
                                                                                                 },
                                                                                                 {
@@ -1385,7 +1385,7 @@
                                                                                                     "booleanActions":  0,
                                                                                                     "defaultValue":  false,
                                                                                                     "unconfiguredValue":  false,
-                                                                                                    "policyType":  76,
+                                                                                                    "policyType":  77,
                                                                                                     "enabled":  true
                                                                                                 },
                                                                                                 {
@@ -1412,7 +1412,7 @@
                                                                                                     "booleanActions":  0,
                                                                                                     "defaultValue":  false,
                                                                                                     "unconfiguredValue":  false,
-                                                                                                    "policyType":  76,
+                                                                                                    "policyType":  77,
                                                                                                     "enabled":  true
                                                                                                 }
                                                                                             ],
@@ -1426,7 +1426,7 @@
 
                                                                                      ],
                                                                          "booleanActions":  0,
-                                                                         "policyType":  76,
+                                                                         "policyType":  77,
                                                                          "enabled":  true
                                                                      },
                                                                      {
@@ -1455,7 +1455,7 @@
                                                                                                     "booleanActions":  0,
                                                                                                     "defaultValue":  false,
                                                                                                     "unconfiguredValue":  false,
-                                                                                                    "policyType":  76,
+                                                                                                    "policyType":  77,
                                                                                                     "enabled":  true
                                                                                                 },
                                                                                                 {
@@ -1482,7 +1482,7 @@
                                                                                                     "booleanActions":  0,
                                                                                                     "defaultValue":  false,
                                                                                                     "unconfiguredValue":  false,
-                                                                                                    "policyType":  76,
+                                                                                                    "policyType":  77,
                                                                                                     "enabled":  true
                                                                                                 }
                                                                                             ],
@@ -1496,7 +1496,7 @@
 
                                                                                      ],
                                                                          "booleanActions":  0,
-                                                                         "policyType":  76,
+                                                                         "policyType":  77,
                                                                          "enabled":  true
                                                                      }
                                                                  ]

Documentation/ObjectInfo/defendersecuritycenter_windows10endpointprotection.json

@@ -13,7 +13,7 @@
 
                                                                                ],
                                                                    "booleanActions":  0,
-                                                                   "policyType":  76,
+                                                                   "policyType":  77,
                                                                    "enabled":  true
                                                                },
                                                                {
@@ -29,7 +29,7 @@
 
                                                                                ],
                                                                    "booleanActions":  0,
-                                                                   "policyType":  76,
+                                                                   "policyType":  77,
                                                                    "enabled":  true
                                                                },
                                                                {
@@ -64,7 +64,7 @@
                                                                                                          ],
                                                                                              "entityKey":  "defenderSecurityCenterDisableRansomwareUI",
                                                                                              "booleanActions":  0,
-                                                                                             "policyType":  76,
+                                                                                             "policyType":  77,
                                                                                              "enabled":  true
                                                                                          }
                                                                                      ],
@@ -86,7 +86,7 @@
                                                                                ],
                                                                    "entityKey":  "defenderSecurityCenterDisableVirusUI",
                                                                    "booleanActions":  0,
-                                                                   "policyType":  76,
+                                                                   "policyType":  77,
                                                                    "enabled":  true
                                                                },
                                                                {
@@ -115,7 +115,7 @@
                                                                                ],
                                                                    "entityKey":  "defenderSecurityCenterDisableAccountUI",
                                                                    "booleanActions":  0,
-                                                                   "policyType":  76,
+                                                                   "policyType":  77,
                                                                    "enabled":  true
                                                                },
                                                                {
@@ -144,7 +144,7 @@
                                                                                ],
                                                                    "entityKey":  "defenderSecurityCenterDisableNetworkUI",
                                                                    "booleanActions":  0,
-                                                                   "policyType":  76,
+                                                                   "policyType":  77,
                                                                    "enabled":  true
                                                                },
                                                                {
@@ -173,7 +173,7 @@
                                                                                ],
                                                                    "entityKey":  "defenderSecurityCenterDisableAppBrowserUI",
                                                                    "booleanActions":  0,
-                                                                   "policyType":  76,
+                                                                   "policyType":  77,
                                                                    "enabled":  true
                                                                },
                                                                {
@@ -199,7 +199,7 @@
                                                                    "entityKey":  "defenderSecurityCenterDisableHardwareUI",
                                                                    "booleanActions":  0,
                                                                    "defaultValue":  false,
-                                                                   "policyType":  76,
+                                                                   "policyType":  77,
                                                                    "enabled":  true
                                                                },
                                                                {
@@ -228,7 +228,7 @@
                                                                                ],
                                                                    "entityKey":  "defenderSecurityCenterDisableHealthUI",
                                                                    "booleanActions":  0,
-                                                                   "policyType":  76,
+                                                                   "policyType":  77,
                                                                    "enabled":  true
                                                                },
                                                                {
@@ -257,7 +257,7 @@
                                                                                ],
                                                                    "entityKey":  "defenderSecurityCenterDisableFamilyUI",
                                                                    "booleanActions":  0,
-                                                                   "policyType":  76,
+                                                                   "policyType":  77,
                                                                    "enabled":  true
                                                                },
                                                                {
@@ -289,7 +289,7 @@
                                                                    "booleanActions":  0,
                                                                    "defaultValue":  "notConfigured",
                                                                    "unconfiguredValue":  "notConfigured",
-                                                                   "policyType":  76,
+                                                                   "policyType":  77,
                                                                    "enabled":  true
                                                                },
                                                                {
@@ -318,7 +318,7 @@
                                                                                ],
                                                                    "entityKey":  "defenderSecurityCenterDisableNotificationAreaUI",
                                                                    "booleanActions":  0,
-                                                                   "policyType":  76,
+                                                                   "policyType":  77,
                                                                    "enabled":  true
                                                                },
                                                                {
@@ -347,7 +347,7 @@
                                                                                ],
                                                                    "entityKey":  "defenderSecurityCenterDisableClearTpmUI",
                                                                    "booleanActions":  0,
-                                                                   "policyType":  76,
+                                                                   "policyType":  77,
                                                                    "enabled":  true
                                                                },
                                                                {
@@ -376,7 +376,7 @@
                                                                                ],
                                                                    "entityKey":  "defenderSecurityCenterDisableVulnerableTpmFirmwareUpdateUI",
                                                                    "booleanActions":  0,
-                                                                   "policyType":  76,
+                                                                   "policyType":  77,
                                                                    "enabled":  true
                                                                },
                                                                {
@@ -408,7 +408,7 @@
                                                                    "booleanActions":  0,
                                                                    "defaultValue":  "notConfigured",
                                                                    "unconfiguredValue":  "notConfigured",
-                                                                   "policyType":  76,
+                                                                   "policyType":  77,
                                                                    "enabled":  false
                                                                },
                                                                {
@@ -424,7 +424,7 @@
 
                                                                                ],
                                                                    "booleanActions":  0,
-                                                                   "policyType":  76,
+                                                                   "policyType":  77,
                                                                    "enabled":  true
                                                                },
                                                                {
@@ -440,7 +440,7 @@
 
                                                                                ],
                                                                    "booleanActions":  0,
-                                                                   "policyType":  76,
+                                                                   "policyType":  77,
                                                                    "enabled":  true
                                                                },
                                                                {
@@ -464,7 +464,7 @@
                                                                                              "entityKey":  "defenderSecurityCenterOrganizationDisplayName",
                                                                                              "booleanActions":  0,
                                                                                              "defaultValue":  "",
-                                                                                             "policyType":  76,
+                                                                                             "policyType":  77,
                                                                                              "enabled":  true
                                                                                          },
                                                                                          {
@@ -480,7 +480,7 @@
 
                                                                                                          ],
                                                                                              "booleanActions":  0,
-                                                                                             "policyType":  76,
+                                                                                             "policyType":  77,
                                                                                              "enabled":  true
                                                                                          },
                                                                                          {
@@ -498,7 +498,7 @@
                                                                                              "entityKey":  "defenderSecurityCenterHelpPhone",
                                                                                              "booleanActions":  0,
                                                                                              "defaultValue":  "",
-                                                                                             "policyType":  76,
+                                                                                             "policyType":  77,
                                                                                              "enabled":  true
                                                                                          },
                                                                                          {
@@ -516,7 +516,7 @@
                                                                                              "entityKey":  "defenderSecurityCenterHelpEmail",
                                                                                              "booleanActions":  0,
                                                                                              "defaultValue":  "",
-                                                                                             "policyType":  76,
+                                                                                             "policyType":  77,
                                                                                              "enabled":  true
                                                                                          },
                                                                                          {
@@ -534,7 +534,7 @@
                                                                                              "entityKey":  "defenderSecurityCenterHelpURL",
                                                                                              "booleanActions":  0,
                                                                                              "defaultValue":  "",
-                                                                                             "policyType":  76,
+                                                                                             "policyType":  77,
                                                                                              "enabled":  true
                                                                                          }
                                                                                      ],
@@ -564,7 +564,7 @@
                                                                    "booleanActions":  0,
                                                                    "defaultValue":  "notConfigured",
                                                                    "unconfiguredValue":  "notConfigured",
-                                                                   "policyType":  76,
+                                                                   "policyType":  77,
                                                                    "enabled":  true
                                                                }
                                                            ]

Documentation/ObjectInfo/deliveryoptimization_windowsdeliveryoptimization.json

@@ -13,7 +13,7 @@
 
                                                                              ],
                                                                  "booleanActions":  0,
-                                                                 "policyType":  106,
+                                                                 "policyType":  107,
                                                                  "enabled":  true
                                                              },
                                                              {
@@ -29,7 +29,7 @@
 
                                                                              ],
                                                                  "booleanActions":  0,
-                                                                 "policyType":  106,
+                                                                 "policyType":  107,
                                                                  "enabled":  true
                                                              },
                                                              {
@@ -80,7 +80,7 @@
                                                                  "entityKey":  "deliveryOptimizationMode",
                                                                  "booleanActions":  0,
                                                                  "defaultValue":  "userDefined",
-                                                                 "policyType":  106,
+                                                                 "policyType":  107,
                                                                  "enabled":  false
                                                              },
                                                              {
@@ -102,7 +102,7 @@
 
                                                                                                        ],
                                                                                            "booleanActions":  0,
-                                                                                           "policyType":  106,
+                                                                                           "policyType":  107,
                                                                                            "enabled":  true
                                                                                        },
                                                                                        {
@@ -138,7 +138,7 @@
                                                                                                                                                                            ],
                                                                                                                                                                "entityKey":  "maximumDownloadBandwidthInKilobytesPerSecond",
                                                                                                                                                                "booleanActions":  0,
-                                                                                                                                                               "policyType":  106,
+                                                                                                                                                               "policyType":  107,
                                                                                                                                                                "enabled":  true
                                                                                                                                                            },
                                                                                                                                                            {
@@ -155,7 +155,7 @@
                                                                                                                                                                            ],
                                                                                                                                                                "entityKey":  "maximumUploadBandwidthInKilobytesPerSecond",
                                                                                                                                                                "booleanActions":  0,
-                                                                                                                                                               "policyType":  106,
+                                                                                                                                                               "policyType":  107,
                                                                                                                                                                "enabled":  true
                                                                                                                                                            }
                                                                                                                                                        ],
@@ -178,7 +178,7 @@
                                                                                                                                                                            ],
                                                                                                                                                                "entityKey":  "maximumForegroundBandwidthPercentage",
                                                                                                                                                                "booleanActions":  0,
-                                                                                                                                                               "policyType":  106,
+                                                                                                                                                               "policyType":  107,
                                                                                                                                                                "enabled":  true
                                                                                                                                                            },
                                                                                                                                                            {
@@ -194,7 +194,7 @@
                                                                                                                                                                            ],
                                                                                                                                                                "entityKey":  "maximumBackgroundBandwidthPercentage",
                                                                                                                                                                "booleanActions":  0,
-                                                                                                                                                               "policyType":  106,
+                                                                                                                                                               "policyType":  107,
                                                                                                                                                                "enabled":  true
                                                                                                                                                            }
                                                                                                                                                        ],
@@ -217,7 +217,7 @@
 
                                                                                                                                                                            ],
                                                                                                                                                                "booleanActions":  0,
-                                                                                                                                                               "policyType":  106,
+                                                                                                                                                               "policyType":  107,
                                                                                                                                                                "enabled":  true
                                                                                                                                                            },
                                                                                                                                                            {
@@ -234,7 +234,7 @@
                                                                                                                                                                                                       ],
                                                                                                                                                                                           "entityKey":  "@odata.type",
                                                                                                                                                                                           "booleanActions":  0,
-                                                                                                                                                                                          "policyType":  106,
+                                                                                                                                                                                          "policyType":  107,
                                                                                                                                                                                           "enabled":  true
                                                                                                                                                                                       },
                                                                                                                                                                                       {
@@ -379,7 +379,7 @@
                                                                                                                                                                                                                                 ],
                                                                                                                                                                                                                     "entityKey":  "bandwidthEndBusinessHours",
                                                                                                                                                                                                                     "booleanActions":  0,
-                                                                                                                                                                                                                    "policyType":  106,
+                                                                                                                                                                                                                    "policyType":  107,
                                                                                                                                                                                                                     "enabled":  true
                                                                                                                                                                                                                 },
                                                                                                                                                                                                                 {
@@ -395,7 +395,7 @@
                                                                                                                                                                                                                                 ],
                                                                                                                                                                                                                     "entityKey":  "bandwidthPercentageDuringBusinessHours",
                                                                                                                                                                                                                     "booleanActions":  0,
-                                                                                                                                                                                                                    "policyType":  106,
+                                                                                                                                                                                                                    "policyType":  107,
                                                                                                                                                                                                                     "enabled":  true
                                                                                                                                                                                                                 },
                                                                                                                                                                                                                 {
@@ -411,7 +411,7 @@
                                                                                                                                                                                                                                 ],
                                                                                                                                                                                                                     "entityKey":  "bandwidthPercentageOutsideBusinessHours",
                                                                                                                                                                                                                     "booleanActions":  0,
-                                                                                                                                                                                                                    "policyType":  106,
+                                                                                                                                                                                                                    "policyType":  107,
                                                                                                                                                                                                                     "enabled":  true
                                                                                                                                                                                                                 }
                                                                                                                                                                                                             ],
@@ -543,7 +543,7 @@
                                                                                                                                                                                                       ],
                                                                                                                                                                                           "entityKey":  "bandwidthBeginBusinessHours",
                                                                                                                                                                                           "booleanActions":  0,
-                                                                                                                                                                                          "policyType":  106,
+                                                                                                                                                                                          "policyType":  107,
                                                                                                                                                                                           "enabled":  true
                                                                                                                                                                                       }
                                                                                                                                                                                   ],
@@ -557,7 +557,7 @@
                                                                                                                                                                            ],
                                                                                                                                                                "entityKey":  "bandwidthForegroundPercentageHours",
                                                                                                                                                                "booleanActions":  0,
-                                                                                                                                                               "policyType":  106,
+                                                                                                                                                               "policyType":  107,
                                                                                                                                                                "enabled":  true
                                                                                                                                                            },
                                                                                                                                                            {
@@ -573,7 +573,7 @@
 
                                                                                                                                                                            ],
                                                                                                                                                                "booleanActions":  0,
-                                                                                                                                                               "policyType":  106,
+                                                                                                                                                               "policyType":  107,
                                                                                                                                                                "enabled":  true
                                                                                                                                                            },
                                                                                                                                                            {
@@ -590,7 +590,7 @@
                                                                                                                                                                                                       ],
                                                                                                                                                                                           "entityKey":  "@odata.type",
                                                                                                                                                                                           "booleanActions":  0,
-                                                                                                                                                                                          "policyType":  106,
+                                                                                                                                                                                          "policyType":  107,
                                                                                                                                                                                           "enabled":  true
                                                                                                                                                                                       },
                                                                                                                                                                                       {
@@ -735,7 +735,7 @@
                                                                                                                                                                                                                                 ],
                                                                                                                                                                                                                     "entityKey":  "bandwidthEndBusinessHours",
                                                                                                                                                                                                                     "booleanActions":  0,
-                                                                                                                                                                                                                    "policyType":  106,
+                                                                                                                                                                                                                    "policyType":  107,
                                                                                                                                                                                                                     "enabled":  true
                                                                                                                                                                                                                 },
                                                                                                                                                                                                                 {
@@ -751,7 +751,7 @@
                                                                                                                                                                                                                                 ],
                                                                                                                                                                                                                     "entityKey":  "bandwidthPercentageDuringBusinessHours",
                                                                                                                                                                                                                     "booleanActions":  0,
-                                                                                                                                                                                                                    "policyType":  106,
+                                                                                                                                                                                                                    "policyType":  107,
                                                                                                                                                                                                                     "enabled":  true
                                                                                                                                                                                                                 },
                                                                                                                                                                                                                 {
@@ -767,7 +767,7 @@
                                                                                                                                                                                                                                 ],
                                                                                                                                                                                                                     "entityKey":  "bandwidthPercentageOutsideBusinessHours",
                                                                                                                                                                                                                     "booleanActions":  0,
-                                                                                                                                                                                                                    "policyType":  106,
+                                                                                                                                                                                                                    "policyType":  107,
                                                                                                                                                                                                                     "enabled":  true
                                                                                                                                                                                                                 }
                                                                                                                                                                                                             ],
@@ -899,7 +899,7 @@
                                                                                                                                                                                                       ],
                                                                                                                                                                                           "entityKey":  "bandwidthBeginBusinessHours",
                                                                                                                                                                                           "booleanActions":  0,
-                                                                                                                                                                                          "policyType":  106,
+                                                                                                                                                                                          "policyType":  107,
                                                                                                                                                                                           "enabled":  true
                                                                                                                                                                                       }
                                                                                                                                                                                   ],
@@ -913,7 +913,7 @@
                                                                                                                                                                            ],
                                                                                                                                                                "entityKey":  "bandwidthBackgroundPercentageHours",
                                                                                                                                                                "booleanActions":  0,
-                                                                                                                                                               "policyType":  106,
+                                                                                                                                                               "policyType":  107,
                                                                                                                                                                "enabled":  true
                                                                                                                                                            }
                                                                                                                                                        ],
@@ -922,7 +922,7 @@
                                                                                                                                   ],
                                                                                                                       "entityKey":  "@odata.type",
                                                                                                                       "booleanActions":  0,
-                                                                                                                      "policyType":  106,
+                                                                                                                      "policyType":  107,
                                                                                                                       "enabled":  true
                                                                                                                   }
                                                                                                               ],
@@ -936,7 +936,7 @@
                                                                                                        ],
                                                                                            "entityKey":  "bandwidthMode",
                                                                                            "booleanActions":  0,
-                                                                                           "policyType":  106,
+                                                                                           "policyType":  107,
                                                                                            "enabled":  true
                                                                                        },
                                                                                        {
@@ -955,7 +955,7 @@
                                                                                            "booleanActions":  0,
                                                                                            "defaultValue":  0,
                                                                                            "unconfiguredValue":  0,
-                                                                                           "policyType":  106,
+                                                                                           "policyType":  107,
                                                                                            "enabled":  true
                                                                                        },
                                                                                        {
@@ -972,7 +972,7 @@
                                                                                                        ],
                                                                                            "entityKey":  "foregroundDownloadFromHttpDelayInSeconds",
                                                                                            "booleanActions":  0,
-                                                                                           "policyType":  106,
+                                                                                           "policyType":  107,
                                                                                            "enabled":  true
                                                                                        },
                                                                                        {
@@ -988,7 +988,7 @@
 
                                                                                                        ],
                                                                                            "booleanActions":  0,
-                                                                                           "policyType":  106,
+                                                                                           "policyType":  107,
                                                                                            "enabled":  true
                                                                                        },
                                                                                        {
@@ -1005,7 +1005,7 @@
                                                                                                        ],
                                                                                            "entityKey":  "minimumRamAllowedToPeerInGigabytes",
                                                                                            "booleanActions":  0,
-                                                                                           "policyType":  106,
+                                                                                           "policyType":  107,
                                                                                            "enabled":  true
                                                                                        },
                                                                                        {
@@ -1022,7 +1022,7 @@
                                                                                                        ],
                                                                                            "entityKey":  "minimumDiskSizeAllowedToPeerInGigabytes",
                                                                                            "booleanActions":  0,
-                                                                                           "policyType":  106,
+                                                                                           "policyType":  107,
                                                                                            "enabled":  true
                                                                                        },
                                                                                        {
@@ -1039,7 +1039,7 @@
                                                                                                        ],
                                                                                            "entityKey":  "minimumFileSizeToCacheInMegabytes",
                                                                                            "booleanActions":  0,
-                                                                                           "policyType":  106,
+                                                                                           "policyType":  107,
                                                                                            "enabled":  true
                                                                                        },
                                                                                        {
@@ -1056,7 +1056,7 @@
                                                                                                        ],
                                                                                            "entityKey":  "minimumBatteryPercentageAllowedToUpload",
                                                                                            "booleanActions":  0,
-                                                                                           "policyType":  106,
+                                                                                           "policyType":  107,
                                                                                            "enabled":  true
                                                                                        },
                                                                                        {
@@ -1073,7 +1073,7 @@
                                                                                                        ],
                                                                                            "entityKey":  "modifyCacheLocation",
                                                                                            "booleanActions":  0,
-                                                                                           "policyType":  106,
+                                                                                           "policyType":  107,
                                                                                            "enabled":  true
                                                                                        },
                                                                                        {
@@ -1090,7 +1090,7 @@
                                                                                                        ],
                                                                                            "entityKey":  "maximumCacheAgeInDays",
                                                                                            "booleanActions":  0,
-                                                                                           "policyType":  106,
+                                                                                           "policyType":  107,
                                                                                            "enabled":  true
                                                                                        },
                                                                                        {
@@ -1126,7 +1126,7 @@
                                                                                                                                                                            ],
                                                                                                                                                                "entityKey":  "maximumCacheSizeInGigabytes",
                                                                                                                                                                "booleanActions":  0,
-                                                                                                                                                               "policyType":  106,
+                                                                                                                                                               "policyType":  107,
                                                                                                                                                                "enabled":  true
                                                                                                                                                            }
                                                                                                                                                        ],
@@ -1150,7 +1150,7 @@
                                                                                                                                                                            ],
                                                                                                                                                                "entityKey":  "maximumCacheSizePercentage",
                                                                                                                                                                "booleanActions":  0,
-                                                                                                                                                               "policyType":  106,
+                                                                                                                                                               "policyType":  107,
                                                                                                                                                                "enabled":  true
                                                                                                                                                            }
                                                                                                                                                        ],
@@ -1159,7 +1159,7 @@
                                                                                                                                   ],
                                                                                                                       "entityKey":  "@odata.type",
                                                                                                                       "booleanActions":  0,
-                                                                                                                      "policyType":  106,
+                                                                                                                      "policyType":  107,
                                                                                                                       "enabled":  true
                                                                                                                   }
                                                                                                               ],
@@ -1173,7 +1173,7 @@
                                                                                                        ],
                                                                                            "entityKey":  "maximumCacheSize",
                                                                                            "booleanActions":  0,
-                                                                                           "policyType":  106,
+                                                                                           "policyType":  107,
                                                                                            "enabled":  true
                                                                                        },
                                                                                        {
@@ -1205,7 +1205,7 @@
                                                                                            "booleanActions":  0,
                                                                                            "defaultValue":  "notConfigured",
                                                                                            "unconfiguredValue":  "notConfigured",
-                                                                                           "policyType":  106,
+                                                                                           "policyType":  107,
                                                                                            "enabled":  true
                                                                                        }
                                                                                    ],
@@ -1248,7 +1248,7 @@
                                                                                                           "booleanActions":  0,
                                                                                                           "defaultValue":  "notConfigured",
                                                                                                           "unconfiguredValue":  "notConfigured",
-                                                                                                          "policyType":  106,
+                                                                                                          "policyType":  107,
                                                                                                           "enabled":  true
                                                                                                       }
                                                                                                   ],
@@ -1282,7 +1282,7 @@
                                                                                                           "booleanActions":  0,
                                                                                                           "defaultValue":  "notConfigured",
                                                                                                           "unconfiguredValue":  "notConfigured",
-                                                                                                          "policyType":  106,
+                                                                                                          "policyType":  107,
                                                                                                           "enabled":  true
                                                                                                       },
                                                                                                       {
@@ -1317,7 +1317,7 @@
                                                                                                                                                                                           ],
                                                                                                                                                                               "entityKey":  "@odata.type",
                                                                                                                                                                               "booleanActions":  0,
-                                                                                                                                                                              "policyType":  106,
+                                                                                                                                                                              "policyType":  107,
                                                                                                                                                                               "enabled":  true
                                                                                                                                                                           },
                                                                                                                                                                           {
@@ -1332,7 +1332,7 @@
                                                                                                                                                                                           ],
                                                                                                                                                                               "entityKey":  "groupIdSourceOption",
                                                                                                                                                                               "booleanActions":  0,
-                                                                                                                                                                              "policyType":  106,
+                                                                                                                                                                              "policyType":  107,
                                                                                                                                                                               "enabled":  true
                                                                                                                                                                           }
                                                                                                                                                                       ],
@@ -1346,7 +1346,7 @@
                                                                                                                                                                ],
                                                                                                                                                    "entityKey":  "groupIdSource",
                                                                                                                                                    "booleanActions":  0,
-                                                                                                                                                   "policyType":  106,
+                                                                                                                                                   "policyType":  107,
                                                                                                                                                    "enabled":  true
                                                                                                                                                }
                                                                                                                                            ],
@@ -1370,7 +1370,7 @@
                                                                                                                                                                                           ],
                                                                                                                                                                               "entityKey":  "@odata.type",
                                                                                                                                                                               "booleanActions":  0,
-                                                                                                                                                                              "policyType":  106,
+                                                                                                                                                                              "policyType":  107,
                                                                                                                                                                               "enabled":  true
                                                                                                                                                                           },
                                                                                                                                                                           {
@@ -1385,7 +1385,7 @@
                                                                                                                                                                                           ],
                                                                                                                                                                               "entityKey":  "groupIdSourceOption",
                                                                                                                                                                               "booleanActions":  0,
-                                                                                                                                                                              "policyType":  106,
+                                                                                                                                                                              "policyType":  107,
                                                                                                                                                                               "enabled":  true
                                                                                                                                                                           }
                                                                                                                                                                       ],
@@ -1399,7 +1399,7 @@
                                                                                                                                                                ],
                                                                                                                                                    "entityKey":  "groupIdSource",
                                                                                                                                                    "booleanActions":  0,
-                                                                                                                                                   "policyType":  106,
+                                                                                                                                                   "policyType":  107,
                                                                                                                                                    "enabled":  true
                                                                                                                                                }
                                                                                                                                            ],
@@ -1423,7 +1423,7 @@
                                                                                                                                                                                           ],
                                                                                                                                                                               "entityKey":  "@odata.type",
                                                                                                                                                                               "booleanActions":  0,
-                                                                                                                                                                              "policyType":  106,
+                                                                                                                                                                              "policyType":  107,
                                                                                                                                                                               "enabled":  true
                                                                                                                                                                           },
                                                                                                                                                                           {
@@ -1438,7 +1438,7 @@
                                                                                                                                                                                           ],
                                                                                                                                                                               "entityKey":  "groupIdSourceOption",
                                                                                                                                                                               "booleanActions":  0,
-                                                                                                                                                                              "policyType":  106,
+                                                                                                                                                                              "policyType":  107,
                                                                                                                                                                               "enabled":  true
                                                                                                                                                                           }
                                                                                                                                                                       ],
@@ -1452,7 +1452,7 @@
                                                                                                                                                                ],
                                                                                                                                                    "entityKey":  "groupIdSource",
                                                                                                                                                    "booleanActions":  0,
-                                                                                                                                                   "policyType":  106,
+                                                                                                                                                   "policyType":  107,
                                                                                                                                                    "enabled":  true
                                                                                                                                                }
                                                                                                                                            ],
@@ -1476,7 +1476,7 @@
                                                                                                                                                                                           ],
                                                                                                                                                                               "entityKey":  "@odata.type",
                                                                                                                                                                               "booleanActions":  0,
-                                                                                                                                                                              "policyType":  106,
+                                                                                                                                                                              "policyType":  107,
                                                                                                                                                                               "enabled":  true
                                                                                                                                                                           },
                                                                                                                                                                           {
@@ -1491,7 +1491,7 @@
                                                                                                                                                                                           ],
                                                                                                                                                                               "entityKey":  "groupIdSourceOption",
                                                                                                                                                                               "booleanActions":  0,
-                                                                                                                                                                              "policyType":  106,
+                                                                                                                                                                              "policyType":  107,
                                                                                                                                                                               "enabled":  true
                                                                                                                                                                           }
                                                                                                                                                                       ],
@@ -1505,7 +1505,7 @@
                                                                                                                                                                ],
                                                                                                                                                    "entityKey":  "groupIdSource",
                                                                                                                                                    "booleanActions":  0,
-                                                                                                                                                   "policyType":  106,
+                                                                                                                                                   "policyType":  107,
                                                                                                                                                    "enabled":  true
                                                                                                                                                }
                                                                                                                                            ],
@@ -1529,7 +1529,7 @@
                                                                                                                                                                                           ],
                                                                                                                                                                               "entityKey":  "@odata.type",
                                                                                                                                                                               "booleanActions":  0,
-                                                                                                                                                                              "policyType":  106,
+                                                                                                                                                                              "policyType":  107,
                                                                                                                                                                               "enabled":  true
                                                                                                                                                                           },
                                                                                                                                                                           {
@@ -1546,7 +1546,7 @@
                                                                                                                                                                                           ],
                                                                                                                                                                               "entityKey":  "groupIdCustom",
                                                                                                                                                                               "booleanActions":  0,
-                                                                                                                                                                              "policyType":  106,
+                                                                                                                                                                              "policyType":  107,
                                                                                                                                                                               "enabled":  true
                                                                                                                                                                           }
                                                                                                                                                                       ],
@@ -1560,7 +1560,7 @@
                                                                                                                                                                ],
                                                                                                                                                    "entityKey":  "groupIdSource",
                                                                                                                                                    "booleanActions":  0,
-                                                                                                                                                   "policyType":  106,
+                                                                                                                                                   "policyType":  107,
                                                                                                                                                    "enabled":  true
                                                                                                                                                }
                                                                                                                                            ],
@@ -1571,7 +1571,7 @@
                                                                                                           "booleanActions":  0,
                                                                                                           "defaultValue":  "notConfigured",
                                                                                                           "unconfiguredValue":  "notConfigrued",
-                                                                                                          "policyType":  106,
+                                                                                                          "policyType":  107,
                                                                                                           "enabled":  true
                                                                                                       }
                                                                                                   ],
@@ -1597,7 +1597,7 @@
                                                                  "booleanActions":  0,
                                                                  "defaultValue":  "userDefined",
                                                                  "unconfiguredValue":  "userDefined",
-                                                                 "policyType":  106,
+                                                                 "policyType":  107,
                                                                  "enabled":  true
                                                              },
                                                              {
@@ -1613,7 +1613,7 @@
 
                                                                              ],
                                                                  "booleanActions":  0,
-                                                                 "policyType":  106,
+                                                                 "policyType":  107,
                                                                  "enabled":  true
                                                              },
                                                              {
@@ -1631,7 +1631,7 @@
                                                                                                                   ],
                                                                                                       "entityKey":  "cacheServerHostNames",
                                                                                                       "booleanActions":  0,
-                                                                                                      "policyType":  106,
+                                                                                                      "policyType":  107,
                                                                                                       "enabled":  true
                                                                                                   }
                                                                                  }
@@ -1648,7 +1648,7 @@
                                                                              ],
                                                                  "entityKey":  "cacheServerHostNames",
                                                                  "booleanActions":  0,
-                                                                 "policyType":  106,
+                                                                 "policyType":  107,
                                                                  "enabled":  true
                                                              },
                                                              {
@@ -1666,7 +1666,7 @@
                                                                  "booleanActions":  0,
                                                                  "defaultValue":  0,
                                                                  "unconfiguredValue":  0,
-                                                                 "policyType":  106,
+                                                                 "policyType":  107,
                                                                  "enabled":  true
                                                              },
                                                              {
@@ -1684,7 +1684,7 @@
                                                                  "booleanActions":  0,
                                                                  "defaultValue":  0,
                                                                  "unconfiguredValue":  0,
-                                                                 "policyType":  106,
+                                                                 "policyType":  107,
                                                                  "enabled":  true
                                                              },
                                                              {
@@ -1699,7 +1699,7 @@
                                                                              ],
                                                                  "entityKey":  "maximumCacheSizePercentageBacking",
                                                                  "booleanActions":  0,
-                                                                 "policyType":  106,
+                                                                 "policyType":  107,
                                                                  "enabled":  true
                                                              },
                                                              {
@@ -1714,7 +1714,7 @@
                                                                              ],
                                                                  "entityKey":  "vpnPeerCachingBacking",
                                                                  "booleanActions":  0,
-                                                                 "policyType":  106,
+                                                                 "policyType":  107,
                                                                  "enabled":  true
                                                              },
                                                              {
@@ -1729,7 +1729,7 @@
                                                                              ],
                                                                  "entityKey":  "maximumCacheAgeInDaysBacking",
                                                                  "booleanActions":  0,
-                                                                 "policyType":  106,
+                                                                 "policyType":  107,
                                                                  "enabled":  true
                                                              },
                                                              {
@@ -1744,7 +1744,7 @@
                                                                              ],
                                                                  "entityKey":  "groupIdSourceOptionsBacking",
                                                                  "booleanActions":  0,
-                                                                 "policyType":  106,
+                                                                 "policyType":  107,
                                                                  "enabled":  true
                                                              },
                                                              {
@@ -1759,7 +1759,7 @@
                                                                              ],
                                                                  "entityKey":  "groupIdCustomBacking",
                                                                  "booleanActions":  0,
-                                                                 "policyType":  106,
+                                                                 "policyType":  107,
                                                                  "enabled":  true
                                                              },
                                                              {
@@ -1774,7 +1774,7 @@
                                                                              ],
                                                                  "entityKey":  "maximumCacheSizeInGigabytesBacking",
                                                                  "booleanActions":  0,
-                                                                 "policyType":  106,
+                                                                 "policyType":  107,
                                                                  "enabled":  true
                                                              },
                                                              {
@@ -1789,7 +1789,7 @@
                                                                              ],
                                                                  "entityKey":  "maximumDownloadBandwidthBacking",
                                                                  "booleanActions":  0,
-                                                                 "policyType":  106,
+                                                                 "policyType":  107,
                                                                  "enabled":  true
                                                              },
                                                              {
@@ -1804,7 +1804,7 @@
                                                                              ],
                                                                  "entityKey":  "maximumUploadBandwidthBacking",
                                                                  "booleanActions":  0,
-                                                                 "policyType":  106,
+                                                                 "policyType":  107,
                                                                  "enabled":  true
                                                              },
                                                              {
@@ -1819,7 +1819,7 @@
                                                                              ],
                                                                  "entityKey":  "maximumBackgroundBandwidthPercentageBacking",
                                                                  "booleanActions":  0,
-                                                                 "policyType":  106,
+                                                                 "policyType":  107,
                                                                  "enabled":  true
                                                              },
                                                              {
@@ -1834,7 +1834,7 @@
                                                                              ],
                                                                  "entityKey":  "maximumForegroundBandwidthPercentageBacking",
                                                                  "booleanActions":  0,
-                                                                 "policyType":  106,
+                                                                 "policyType":  107,
                                                                  "enabled":  true
                                                              },
                                                              {
@@ -1849,7 +1849,7 @@
                                                                              ],
                                                                  "entityKey":  "bandwidthForegroundPercentageHoursBacking",
                                                                  "booleanActions":  0,
-                                                                 "policyType":  106,
+                                                                 "policyType":  107,
                                                                  "enabled":  true
                                                              },
                                                              {
@@ -1864,7 +1864,7 @@
                                                                              ],
                                                                  "entityKey":  "bandwidthBackgroundPercentageHoursBacking",
                                                                  "booleanActions":  0,
-                                                                 "policyType":  106,
+                                                                 "policyType":  107,
                                                                  "enabled":  true
                                                              }
                                                          ]

Documentation/ObjectInfo/derivedcredentialauthenticationconfiguration_androiddeviceownerderivedcredentialappauthenticationconfiguration.json

@@ -72,30 +72,6 @@
                                                                                                                                "booleanActions":  0,
                                                                                                                                "policyType":  3,
                                                                                                                                "enabled":  true
-                                                                                                                           },
-                                                                                                                           {
-                                                                                                                               "dataType":  19,
-                                                                                                                               "category":  35,
-                                                                                                                               "nameResourceKey":  "useDerivedCredentialForAppAuthentication",
-                                                                                                                               "childSettings":  [
-
-                                                                                                                                                 ],
-                                                                                                                               "options":  [
-                                                                                                                                               {
-                                                                                                                                                   "nameResourceKey":  "yes",
-                                                                                                                                                   "value":  true,
-                                                                                                                                                   "enabled":  true
-                                                                                                                                               },
-                                                                                                                                               {
-                                                                                                                                                   "nameResourceKey":  "no",
-                                                                                                                                                   "value":  false,
-                                                                                                                                                   "enabled":  true
-                                                                                                                                               }
-                                                                                                                                           ],
-                                                                                                                               "booleanActions":  0,
-                                                                                                                               "defaultValue":  true,
-                                                                                                                               "policyType":  3,
-                                                                                                                               "enabled":  true
                                                                                                                            }
                                                                                                                        ]
 }

Documentation/ObjectInfo/derivedcredentialauthenticationconfiguration_iosderivedcredentialauthenticationconfiguration.json

@@ -15,7 +15,7 @@
 
                                                                                                                                                    ],
                                                                                                                                        "booleanActions":  0,
-                                                                                                                                       "policyType":  42,
+                                                                                                                                       "policyType":  43,
                                                                                                                                        "enabled":  true
                                                                                                                                    },
                                                                                                                                    {
@@ -29,7 +29,7 @@
 
                                                                                                                                                    ],
                                                                                                                                        "booleanActions":  0,
-                                                                                                                                       "policyType":  42,
+                                                                                                                                       "policyType":  43,
                                                                                                                                        "enabled":  true
                                                                                                                                    }
                                                                                                                                ],
@@ -38,7 +38,7 @@
                                                                                                                          ],
                                                                                                              "entityKey":  "derivedCredentialSettings@odata.bind",
                                                                                                              "booleanActions":  0,
-                                                                                                             "policyType":  42,
+                                                                                                             "policyType":  43,
                                                                                                              "enabled":  true
                                                                                                          },
                                                                                                          {
@@ -54,7 +54,7 @@
 
                                                                                                                          ],
                                                                                                              "booleanActions":  0,
-                                                                                                             "policyType":  42,
+                                                                                                             "policyType":  43,
                                                                                                              "enabled":  true
                                                                                                          },
                                                                                                          {
@@ -70,31 +70,7 @@
 
                                                                                                                          ],
                                                                                                              "booleanActions":  0,
-                                                                                                             "policyType":  42,
+                                                                                                             "policyType":  43,
-                                                                                                             "enabled":  true
-                                                                                                         },
-                                                                                                         {
-                                                                                                             "dataType":  19,
-                                                                                                             "category":  35,
-                                                                                                             "nameResourceKey":  "useDerivedCredentialForAppAuthentication",
-                                                                                                             "childSettings":  [
-
-                                                                                                                               ],
-                                                                                                             "options":  [
-                                                                                                                             {
-                                                                                                                                 "nameResourceKey":  "yes",
-                                                                                                                                 "value":  true,
-                                                                                                                                 "enabled":  true
-                                                                                                                             },
-                                                                                                                             {
-                                                                                                                                 "nameResourceKey":  "no",
-                                                                                                                                 "value":  false,
-                                                                                                                                 "enabled":  true
-                                                                                                                             }
-                                                                                                                         ],
-                                                                                                             "booleanActions":  0,
-                                                                                                             "defaultValue":  true,
-                                                                                                             "policyType":  42,
                                                                                                              "enabled":  true
                                                                                                          }
                                                                                                      ]

Documentation/ObjectInfo/deviceexperience_androiddeviceownergeneral.json

@@ -591,6 +591,175 @@
                                                                                                                                                                    "defaultValue":  false,
                                                                                                                                                                    "policyType":  2,
                                                                                                                                                                    "enabled":  true
+                                                                                                                                                               },
+                                                                                                                                                               {
+                                                                                                                                                                   "dataType":  0,
+                                                                                                                                                                   "category":  43,
+                                                                                                                                                                   "nameResourceKey":  "kioskManagedHomeScreenSignInEnabledName",
+                                                                                                                                                                   "descriptionResourceKey":  "kioskManagedHomeScreenSignInEnabledDescription",
+                                                                                                                                                                   "childSettings":  [
+                                                                                                                                                                                         {
+                                                                                                                                                                                             "dataType":  20,
+                                                                                                                                                                                             "category":  43,
+                                                                                                                                                                                             "nameResourceKey":  "kioskManagedHomeScreenSignInBackgroundName",
+                                                                                                                                                                                             "descriptionResourceKey":  "kioskManagedHomeScreenSignInBackgroundDescription",
+                                                                                                                                                                                             "emptyValueResourceKey":  "kioskManagedHomeScreenSignInBackgroundEmptyValueKey",
+                                                                                                                                                                                             "childSettings":  [
+
+                                                                                                                                                                                                               ],
+                                                                                                                                                                                             "options":  [
+
+                                                                                                                                                                                                         ],
+                                                                                                                                                                                             "entityKey":  "kioskModeManagedHomeScreenSignInBackground",
+                                                                                                                                                                                             "booleanActions":  0,
+                                                                                                                                                                                             "defaultValue":  "",
+                                                                                                                                                                                             "policyType":  2,
+                                                                                                                                                                                             "enabled":  true
+                                                                                                                                                                                         },
+                                                                                                                                                                                         {
+                                                                                                                                                                                             "dataType":  20,
+                                                                                                                                                                                             "category":  43,
+                                                                                                                                                                                             "nameResourceKey":  "kioskManagedHomeScreenSignInBrandingLogoName",
+                                                                                                                                                                                             "descriptionResourceKey":  "kioskManagedHomeScreenSignInBrandingLogoDescription",
+                                                                                                                                                                                             "emptyValueResourceKey":  "kioskManagedHomeScreenSignInBrandingLogoEmptyValueKey",
+                                                                                                                                                                                             "childSettings":  [
+
+                                                                                                                                                                                                               ],
+                                                                                                                                                                                             "options":  [
+
+                                                                                                                                                                                                         ],
+                                                                                                                                                                                             "entityKey":  "kioskModeManagedHomeScreenSignInBrandingLogo",
+                                                                                                                                                                                             "booleanActions":  0,
+                                                                                                                                                                                             "defaultValue":  "",
+                                                                                                                                                                                             "policyType":  2,
+                                                                                                                                                                                             "enabled":  true
+                                                                                                                                                                                         },
+                                                                                                                                                                                         {
+                                                                                                                                                                                             "dataType":  0,
+                                                                                                                                                                                             "category":  43,
+                                                                                                                                                                                             "nameResourceKey":  "kioskManagedHomeScreenPINRequiredName",
+                                                                                                                                                                                             "descriptionResourceKey":  "kioskManagedHomeScreenPINRequiredDescription",
+                                                                                                                                                                                             "childSettings":  [
+                                                                                                                                                                                                                   {
+                                                                                                                                                                                                                       "dataType":  16,
+                                                                                                                                                                                                                       "category":  43,
+                                                                                                                                                                                                                       "nameResourceKey":  "kioskManagedHomeScreenPINComplexityName",
+                                                                                                                                                                                                                       "descriptionResourceKey":  "kioskManagedHomeScreenPINComplexityDescription",
+                                                                                                                                                                                                                       "childSettings":  [
+
+                                                                                                                                                                                                                                         ],
+                                                                                                                                                                                                                       "options":  [
+                                                                                                                                                                                                                                       {
+                                                                                                                                                                                                                                           "nameResourceKey":  "kioskManagedHomeScreenPINComplexityNotConfigured",
+                                                                                                                                                                                                                                           "value":  "notConfigured",
+                                                                                                                                                                                                                                           "enabled":  true
+                                                                                                                                                                                                                                       },
+                                                                                                                                                                                                                                       {
+                                                                                                                                                                                                                                           "nameResourceKey":  "kioskManagedHomeScreenPINComplexitySimple",
+                                                                                                                                                                                                                                           "value":  "simple",
+                                                                                                                                                                                                                                           "enabled":  true
+                                                                                                                                                                                                                                       },
+                                                                                                                                                                                                                                       {
+                                                                                                                                                                                                                                           "nameResourceKey":  "kioskManagedHomeScreenPINComplexityComplex",
+                                                                                                                                                                                                                                           "value":  "complex",
+                                                                                                                                                                                                                                           "enabled":  true
+                                                                                                                                                                                                                                       }
+                                                                                                                                                                                                                                   ],
+                                                                                                                                                                                                                       "entityKey":  "kioskModeManagedHomeScreenPinComplexity",
+                                                                                                                                                                                                                       "booleanActions":  0,
+                                                                                                                                                                                                                       "defaultValue":  "notConfigured",
+                                                                                                                                                                                                                       "unconfiguredValue":  "notConfigured",
+                                                                                                                                                                                                                       "policyType":  2,
+                                                                                                                                                                                                                       "enabled":  true
+                                                                                                                                                                                                                   },
+                                                                                                                                                                                                                   {
+                                                                                                                                                                                                                       "dataType":  0,
+                                                                                                                                                                                                                       "category":  43,
+                                                                                                                                                                                                                       "nameResourceKey":  "kioskManagedHomeScreenPINRequiredToResumeName",
+                                                                                                                                                                                                                       "descriptionResourceKey":  "kioskManagedHomeScreenPINRequiredToResumeDescription",
+                                                                                                                                                                                                                       "childSettings":  [
+
+                                                                                                                                                                                                                                         ],
+                                                                                                                                                                                                                       "options":  [
+
+                                                                                                                                                                                                                                   ],
+                                                                                                                                                                                                                       "entityKey":  "kioskModeManagedHomeScreenPinRequiredToResume",
+                                                                                                                                                                                                                       "booleanActions":  2,
+                                                                                                                                                                                                                       "defaultValue":  false,
+                                                                                                                                                                                                                       "policyType":  2,
+                                                                                                                                                                                                                       "enabled":  true
+                                                                                                                                                                                                                   }
+                                                                                                                                                                                                               ],
+                                                                                                                                                                                             "options":  [
+
+                                                                                                                                                                                                         ],
+                                                                                                                                                                                             "entityKey":  "kioskModeManagedHomeScreenPinRequired",
+                                                                                                                                                                                             "booleanActions":  2,
+                                                                                                                                                                                             "defaultValue":  false,
+                                                                                                                                                                                             "policyType":  2,
+                                                                                                                                                                                             "enabled":  true
+                                                                                                                                                                                         },
+                                                                                                                                                                                         {
+                                                                                                                                                                                             "dataType":  0,
+                                                                                                                                                                                             "category":  43,
+                                                                                                                                                                                             "nameResourceKey":  "kioskManagedHomeScreenAutoSignOutName",
+                                                                                                                                                                                             "descriptionResourceKey":  "kioskManagedHomeScreenAutoSignOutDescription",
+                                                                                                                                                                                             "childSettings":  [
+                                                                                                                                                                                                                   {
+                                                                                                                                                                                                                       "dataType":  14,
+                                                                                                                                                                                                                       "category":  43,
+                                                                                                                                                                                                                       "nameResourceKey":  "kioskManagedHomeScreenInactiveSignOutDelayName",
+                                                                                                                                                                                                                       "descriptionResourceKey":  "kioskManagedHomeScreenInactiveSignOutDelayDescription",
+                                                                                                                                                                                                                       "emptyValueResourceKey":  "kioskScreenSaverSecondsEmptyValueKey",
+                                                                                                                                                                                                                       "childSettings":  [
+
+                                                                                                                                                                                                                                         ],
+                                                                                                                                                                                                                       "options":  [
+
+                                                                                                                                                                                                                                   ],
+                                                                                                                                                                                                                       "entityKey":  "kioskModeManagedHomeScreenInactiveSignOutDelayInSeconds",
+                                                                                                                                                                                                                       "booleanActions":  0,
+                                                                                                                                                                                                                       "defaultValue":  300,
+                                                                                                                                                                                                                       "policyType":  2,
+                                                                                                                                                                                                                       "enabled":  true
+                                                                                                                                                                                                                   },
+                                                                                                                                                                                                                   {
+                                                                                                                                                                                                                       "dataType":  14,
+                                                                                                                                                                                                                       "category":  43,
+                                                                                                                                                                                                                       "nameResourceKey":  "kioskManagedHomeScreenInactiveNoticeDelayName",
+                                                                                                                                                                                                                       "descriptionResourceKey":  "kioskManagedHomeScreenInactiveNoticeDelayDescription",
+                                                                                                                                                                                                                       "emptyValueResourceKey":  "kioskScreenSaverSecondsEmptyValueKey",
+                                                                                                                                                                                                                       "childSettings":  [
+
+                                                                                                                                                                                                                                         ],
+                                                                                                                                                                                                                       "options":  [
+
+                                                                                                                                                                                                                                   ],
+                                                                                                                                                                                                                       "entityKey":  "kioskModeManagedHomeScreenInactiveSignOutNoticeInSeconds",
+                                                                                                                                                                                                                       "booleanActions":  0,
+                                                                                                                                                                                                                       "defaultValue":  60,
+                                                                                                                                                                                                                       "policyType":  2,
+                                                                                                                                                                                                                       "enabled":  true
+                                                                                                                                                                                                                   }
+                                                                                                                                                                                                               ],
+                                                                                                                                                                                             "options":  [
+
+                                                                                                                                                                                                         ],
+                                                                                                                                                                                             "entityKey":  "kioskModeManagedHomeScreenAutoSignout",
+                                                                                                                                                                                             "booleanActions":  2,
+                                                                                                                                                                                             "defaultValue":  false,
+                                                                                                                                                                                             "policyType":  2,
+                                                                                                                                                                                             "enabled":  true
+                                                                                                                                                                                         }
+                                                                                                                                                                                     ],
+                                                                                                                                                                   "options":  [
+
+                                                                                                                                                                               ],
+                                                                                                                                                                   "entityKey":  "kioskModeManagedHomeScreenSignInEnabled",
+                                                                                                                                                                   "booleanActions":  2,
+                                                                                                                                                                   "defaultValue":  false,
+                                                                                                                                                                   "policyType":  2,
+                                                                                                                                                                   "enabled":  true
                                                                                                                                                                }
                                                                                                                                                            ],
                                                                                                                                               "enabled":  true

Documentation/ObjectInfo/devicefirmwareconfigurationinterface_windows10devicefirmwareconfigurationinterface.json

@@ -4,7 +4,7 @@
                                                                                                    "isSettingDescription":  false,
                                                                                                    "showAsSectionHeader":  false,
                                                                                                    "dataType":  8,
-                                                                                                   "category":  135,
+                                                                                                   "category":  136,
                                                                                                    "nameResourceKey":  "dfciHeaderName",
                                                                                                    "childSettings":  [
 
@@ -13,14 +13,14 @@
 
                                                                                                                ],
                                                                                                    "booleanActions":  0,
-                                                                                                   "policyType":  107,
+                                                                                                   "policyType":  108,
                                                                                                    "enabled":  true
                                                                                                },
                                                                                                {
                                                                                                    "isSettingDescription":  false,
                                                                                                    "showAsSectionHeader":  false,
                                                                                                    "dataType":  8,
-                                                                                                   "category":  135,
+                                                                                                   "category":  136,
                                                                                                    "nameResourceKey":  "securityFeaturesName",
                                                                                                    "childSettings":  [
 
@@ -29,12 +29,12 @@
 
                                                                                                                ],
                                                                                                    "booleanActions":  0,
-                                                                                                   "policyType":  107,
+                                                                                                   "policyType":  108,
                                                                                                    "enabled":  true
                                                                                                },
                                                                                                {
                                                                                                    "dataType":  16,
-                                                                                                   "category":  135,
+                                                                                                   "category":  136,
                                                                                                    "nameResourceKey":  "changeUefiSettingsPermissionName",
                                                                                                    "descriptionResourceKey":  "changeUefiSettingsPermissionDescription",
                                                                                                    "childSettings":  [
@@ -56,12 +56,12 @@
                                                                                                    "booleanActions":  0,
                                                                                                    "defaultValue":  "notConfiguredOnly",
                                                                                                    "unconfiguredValue":  "notConfiguredOnly",
-                                                                                                   "policyType":  107,
+                                                                                                   "policyType":  108,
                                                                                                    "enabled":  true
                                                                                                },
                                                                                                {
                                                                                                    "dataType":  16,
-                                                                                                   "category":  135,
+                                                                                                   "category":  136,
                                                                                                    "nameResourceKey":  "virtualizationOfCpuAndIOName",
                                                                                                    "descriptionResourceKey":  "virtualizationOfCpuAndIODescription",
                                                                                                    "childSettings":  [
@@ -88,12 +88,12 @@
                                                                                                    "booleanActions":  0,
                                                                                                    "defaultValue":  "notConfigured",
                                                                                                    "unconfiguredValue":  "notConfigured",
-                                                                                                   "policyType":  107,
+                                                                                                   "policyType":  108,
                                                                                                    "enabled":  true
                                                                                                },
                                                                                                {
                                                                                                    "dataType":  16,
-                                                                                                   "category":  135,
+                                                                                                   "category":  136,
                                                                                                    "nameResourceKey":  "windowsPlatformBinaryTableName",
                                                                                                    "descriptionResourceKey":  "windowsPlatformBinaryTableDescription",
                                                                                                    "childSettings":  [
@@ -120,12 +120,12 @@
                                                                                                    "booleanActions":  0,
                                                                                                    "defaultValue":  "notConfigured",
                                                                                                    "unconfiguredValue":  "notConfigured",
-                                                                                                   "policyType":  107,
+                                                                                                   "policyType":  108,
                                                                                                    "enabled":  false
                                                                                                },
                                                                                                {
                                                                                                    "dataType":  16,
-                                                                                                   "category":  135,
+                                                                                                   "category":  136,
                                                                                                    "nameResourceKey":  "simultaneousMultiThreadingName",
                                                                                                    "descriptionResourceKey":  "simultaneousMultiThreadingDescription",
                                                                                                    "childSettings":  [
@@ -152,14 +152,14 @@
                                                                                                    "booleanActions":  0,
                                                                                                    "defaultValue":  "notConfigured",
                                                                                                    "unconfiguredValue":  "notConfigured",
-                                                                                                   "policyType":  107,
+                                                                                                   "policyType":  108,
                                                                                                    "enabled":  false
                                                                                                },
                                                                                                {
                                                                                                    "isSettingDescription":  false,
                                                                                                    "showAsSectionHeader":  false,
                                                                                                    "dataType":  8,
-                                                                                                   "category":  135,
+                                                                                                   "category":  136,
                                                                                                    "nameResourceKey":  "builtInHardwareName",
                                                                                                    "childSettings":  [
 
@@ -168,14 +168,14 @@
 
                                                                                                                ],
                                                                                                    "booleanActions":  0,
-                                                                                                   "policyType":  107,
+                                                                                                   "policyType":  108,
                                                                                                    "enabled":  true
                                                                                                },
                                                                                                {
                                                                                                    "isSettingDescription":  false,
                                                                                                    "showAsSectionHeader":  false,
                                                                                                    "dataType":  8,
-                                                                                                   "category":  135,
+                                                                                                   "category":  136,
                                                                                                    "nameResourceKey":  "dfciBuiltinHeaderDescName",
                                                                                                    "childSettings":  [
 
@@ -184,12 +184,12 @@
 
                                                                                                                ],
                                                                                                    "booleanActions":  0,
-                                                                                                   "policyType":  107,
+                                                                                                   "policyType":  108,
                                                                                                    "enabled":  true
                                                                                                },
                                                                                                {
                                                                                                    "dataType":  16,
-                                                                                                   "category":  135,
+                                                                                                   "category":  136,
                                                                                                    "nameResourceKey":  "camerasName",
                                                                                                    "descriptionResourceKey":  "camerasDescription",
                                                                                                    "childSettings":  [
@@ -216,12 +216,108 @@
                                                                                                    "booleanActions":  0,
                                                                                                    "defaultValue":  "notConfigured",
                                                                                                    "unconfiguredValue":  "notConfigured",
-                                                                                                   "policyType":  107,
+                                                                                                   "policyType":  108,
                                                                                                    "enabled":  true
                                                                                                },
                                                                                                {
                                                                                                    "dataType":  16,
-                                                                                                   "category":  135,
+                                                                                                   "category":  136,
+                                                                                                   "nameResourceKey":  "frontCamerasName",
+                                                                                                   "descriptionResourceKey":  "frontCamerasDescription",
+                                                                                                   "childSettings":  [
+
+                                                                                                                     ],
+                                                                                                   "options":  [
+                                                                                                                   {
+                                                                                                                       "nameResourceKey":  "notConfigured",
+                                                                                                                       "value":  "notConfigured",
+                                                                                                                       "enabled":  true
+                                                                                                                   },
+                                                                                                                   {
+                                                                                                                       "nameResourceKey":  "enabledOption",
+                                                                                                                       "value":  "enabled",
+                                                                                                                       "enabled":  true
+                                                                                                                   },
+                                                                                                                   {
+                                                                                                                       "nameResourceKey":  "disabledOption",
+                                                                                                                       "value":  "disabled",
+                                                                                                                       "enabled":  true
+                                                                                                                   }
+                                                                                                               ],
+                                                                                                   "entityKey":  "frontCameras",
+                                                                                                   "booleanActions":  0,
+                                                                                                   "defaultValue":  "notConfigured",
+                                                                                                   "unconfiguredValue":  "notConfigured",
+                                                                                                   "policyType":  108,
+                                                                                                   "enabled":  false
+                                                                                               },
+                                                                                               {
+                                                                                                   "dataType":  16,
+                                                                                                   "category":  136,
+                                                                                                   "nameResourceKey":  "rearCamerasName",
+                                                                                                   "descriptionResourceKey":  "rearCamerasDescription",
+                                                                                                   "childSettings":  [
+
+                                                                                                                     ],
+                                                                                                   "options":  [
+                                                                                                                   {
+                                                                                                                       "nameResourceKey":  "notConfigured",
+                                                                                                                       "value":  "notConfigured",
+                                                                                                                       "enabled":  true
+                                                                                                                   },
+                                                                                                                   {
+                                                                                                                       "nameResourceKey":  "enabledOption",
+                                                                                                                       "value":  "enabled",
+                                                                                                                       "enabled":  true
+                                                                                                                   },
+                                                                                                                   {
+                                                                                                                       "nameResourceKey":  "disabledOption",
+                                                                                                                       "value":  "disabled",
+                                                                                                                       "enabled":  true
+                                                                                                                   }
+                                                                                                               ],
+                                                                                                   "entityKey":  "rearCameras",
+                                                                                                   "booleanActions":  0,
+                                                                                                   "defaultValue":  "notConfigured",
+                                                                                                   "unconfiguredValue":  "notConfigured",
+                                                                                                   "policyType":  108,
+                                                                                                   "enabled":  false
+                                                                                               },
+                                                                                               {
+                                                                                                   "dataType":  16,
+                                                                                                   "category":  136,
+                                                                                                   "nameResourceKey":  "infraredCamerasName",
+                                                                                                   "descriptionResourceKey":  "infraredCamerasDescription",
+                                                                                                   "childSettings":  [
+
+                                                                                                                     ],
+                                                                                                   "options":  [
+                                                                                                                   {
+                                                                                                                       "nameResourceKey":  "notConfigured",
+                                                                                                                       "value":  "notConfigured",
+                                                                                                                       "enabled":  true
+                                                                                                                   },
+                                                                                                                   {
+                                                                                                                       "nameResourceKey":  "enabledOption",
+                                                                                                                       "value":  "enabled",
+                                                                                                                       "enabled":  true
+                                                                                                                   },
+                                                                                                                   {
+                                                                                                                       "nameResourceKey":  "disabledOption",
+                                                                                                                       "value":  "disabled",
+                                                                                                                       "enabled":  true
+                                                                                                                   }
+                                                                                                               ],
+                                                                                                   "entityKey":  "infraredCameras",
+                                                                                                   "booleanActions":  0,
+                                                                                                   "defaultValue":  "notConfigured",
+                                                                                                   "unconfiguredValue":  "notConfigured",
+                                                                                                   "policyType":  108,
+                                                                                                   "enabled":  false
+                                                                                               },
+                                                                                               {
+                                                                                                   "dataType":  16,
+                                                                                                   "category":  136,
                                                                                                    "nameResourceKey":  "microphonesAndSpeakersName",
                                                                                                    "descriptionResourceKey":  "microphonesAndSpeakersDescription",
                                                                                                    "childSettings":  [
@@ -248,12 +344,44 @@
                                                                                                    "booleanActions":  0,
                                                                                                    "defaultValue":  "notConfigured",
                                                                                                    "unconfiguredValue":  "notConfigured",
-                                                                                                   "policyType":  107,
+                                                                                                   "policyType":  108,
                                                                                                    "enabled":  true
                                                                                                },
                                                                                                {
                                                                                                    "dataType":  16,
-                                                                                                   "category":  135,
+                                                                                                   "category":  136,
+                                                                                                   "nameResourceKey":  "microphonesName",
+                                                                                                   "descriptionResourceKey":  "microphonesDescription",
+                                                                                                   "childSettings":  [
+
+                                                                                                                     ],
+                                                                                                   "options":  [
+                                                                                                                   {
+                                                                                                                       "nameResourceKey":  "notConfigured",
+                                                                                                                       "value":  "notConfigured",
+                                                                                                                       "enabled":  true
+                                                                                                                   },
+                                                                                                                   {
+                                                                                                                       "nameResourceKey":  "enabledOption",
+                                                                                                                       "value":  "enabled",
+                                                                                                                       "enabled":  true
+                                                                                                                   },
+                                                                                                                   {
+                                                                                                                       "nameResourceKey":  "disabledOption",
+                                                                                                                       "value":  "disabled",
+                                                                                                                       "enabled":  true
+                                                                                                                   }
+                                                                                                               ],
+                                                                                                   "entityKey":  "microphones",
+                                                                                                   "booleanActions":  0,
+                                                                                                   "defaultValue":  "notConfigured",
+                                                                                                   "unconfiguredValue":  "notConfigured",
+                                                                                                   "policyType":  108,
+                                                                                                   "enabled":  false
+                                                                                               },
+                                                                                               {
+                                                                                                   "dataType":  16,
+                                                                                                   "category":  136,
                                                                                                    "nameResourceKey":  "radiosName",
                                                                                                    "descriptionResourceKey":  "radiosDescription",
                                                                                                    "childSettings":  [
@@ -276,7 +404,7 @@
                                                                                                                        "children":  [
                                                                                                                                         {
                                                                                                                                             "dataType":  10,
-                                                                                                                                            "category":  135,
+                                                                                                                                            "category":  136,
                                                                                                                                             "nameResourceKey":  "radioWarningInfoBox",
                                                                                                                                             "childSettings":  [
 
@@ -285,7 +413,7 @@
 
                                                                                                                                                         ],
                                                                                                                                             "booleanActions":  0,
-                                                                                                                                            "policyType":  107,
+                                                                                                                                            "policyType":  108,
                                                                                                                                             "enabled":  true
                                                                                                                                         }
                                                                                                                                     ],
@@ -296,14 +424,142 @@
                                                                                                    "booleanActions":  0,
                                                                                                    "defaultValue":  "notConfigured",
                                                                                                    "unconfiguredValue":  "notConfigured",
-                                                                                                   "policyType":  107,
+                                                                                                   "policyType":  108,
                                                                                                    "enabled":  true
                                                                                                },
+                                                                                               {
+                                                                                                   "dataType":  16,
+                                                                                                   "category":  136,
+                                                                                                   "nameResourceKey":  "bluetoothName",
+                                                                                                   "descriptionResourceKey":  "bluetoothDescription",
+                                                                                                   "childSettings":  [
+
+                                                                                                                     ],
+                                                                                                   "options":  [
+                                                                                                                   {
+                                                                                                                       "nameResourceKey":  "notConfigured",
+                                                                                                                       "value":  "notConfigured",
+                                                                                                                       "enabled":  true
+                                                                                                                   },
+                                                                                                                   {
+                                                                                                                       "nameResourceKey":  "enabledOption",
+                                                                                                                       "value":  "enabled",
+                                                                                                                       "enabled":  true
+                                                                                                                   },
+                                                                                                                   {
+                                                                                                                       "nameResourceKey":  "disabledOption",
+                                                                                                                       "value":  "disabled",
+                                                                                                                       "enabled":  true
+                                                                                                                   }
+                                                                                                               ],
+                                                                                                   "entityKey":  "bluetooth",
+                                                                                                   "booleanActions":  0,
+                                                                                                   "defaultValue":  "notConfigured",
+                                                                                                   "unconfiguredValue":  "notConfigured",
+                                                                                                   "policyType":  108,
+                                                                                                   "enabled":  false
+                                                                                               },
+                                                                                               {
+                                                                                                   "dataType":  16,
+                                                                                                   "category":  136,
+                                                                                                   "nameResourceKey":  "wwanName",
+                                                                                                   "descriptionResourceKey":  "wwanDescription",
+                                                                                                   "childSettings":  [
+
+                                                                                                                     ],
+                                                                                                   "options":  [
+                                                                                                                   {
+                                                                                                                       "nameResourceKey":  "notConfigured",
+                                                                                                                       "value":  "notConfigured",
+                                                                                                                       "enabled":  true
+                                                                                                                   },
+                                                                                                                   {
+                                                                                                                       "nameResourceKey":  "enabledOption",
+                                                                                                                       "value":  "enabled",
+                                                                                                                       "enabled":  true
+                                                                                                                   },
+                                                                                                                   {
+                                                                                                                       "nameResourceKey":  "disabledOption",
+                                                                                                                       "value":  "disabled",
+                                                                                                                       "enabled":  true
+                                                                                                                   }
+                                                                                                               ],
+                                                                                                   "entityKey":  "wwan",
+                                                                                                   "booleanActions":  0,
+                                                                                                   "defaultValue":  "notConfigured",
+                                                                                                   "unconfiguredValue":  "notConfigured",
+                                                                                                   "policyType":  108,
+                                                                                                   "enabled":  false
+                                                                                               },
+                                                                                               {
+                                                                                                   "dataType":  16,
+                                                                                                   "category":  136,
+                                                                                                   "nameResourceKey":  "nfcName",
+                                                                                                   "descriptionResourceKey":  "nfcDescription",
+                                                                                                   "childSettings":  [
+
+                                                                                                                     ],
+                                                                                                   "options":  [
+                                                                                                                   {
+                                                                                                                       "nameResourceKey":  "notConfigured",
+                                                                                                                       "value":  "notConfigured",
+                                                                                                                       "enabled":  true
+                                                                                                                   },
+                                                                                                                   {
+                                                                                                                       "nameResourceKey":  "enabledOption",
+                                                                                                                       "value":  "enabled",
+                                                                                                                       "enabled":  true
+                                                                                                                   },
+                                                                                                                   {
+                                                                                                                       "nameResourceKey":  "disabledOption",
+                                                                                                                       "value":  "disabled",
+                                                                                                                       "enabled":  true
+                                                                                                                   }
+                                                                                                               ],
+                                                                                                   "entityKey":  "nfc",
+                                                                                                   "booleanActions":  0,
+                                                                                                   "defaultValue":  "notConfigured",
+                                                                                                   "unconfiguredValue":  "notConfigured",
+                                                                                                   "policyType":  108,
+                                                                                                   "enabled":  false
+                                                                                               },
+                                                                                               {
+                                                                                                   "dataType":  16,
+                                                                                                   "category":  136,
+                                                                                                   "nameResourceKey":  "wifiName",
+                                                                                                   "descriptionResourceKey":  "wifiDescription",
+                                                                                                   "childSettings":  [
+
+                                                                                                                     ],
+                                                                                                   "options":  [
+                                                                                                                   {
+                                                                                                                       "nameResourceKey":  "notConfigured",
+                                                                                                                       "value":  "notConfigured",
+                                                                                                                       "enabled":  true
+                                                                                                                   },
+                                                                                                                   {
+                                                                                                                       "nameResourceKey":  "enabledOption",
+                                                                                                                       "value":  "enabled",
+                                                                                                                       "enabled":  true
+                                                                                                                   },
+                                                                                                                   {
+                                                                                                                       "nameResourceKey":  "disabledOption",
+                                                                                                                       "value":  "disabled",
+                                                                                                                       "enabled":  true
+                                                                                                                   }
+                                                                                                               ],
+                                                                                                   "entityKey":  "wifi",
+                                                                                                   "booleanActions":  0,
+                                                                                                   "defaultValue":  "notConfigured",
+                                                                                                   "unconfiguredValue":  "notConfigured",
+                                                                                                   "policyType":  108,
+                                                                                                   "enabled":  false
+                                                                                               },
                                                                                                {
                                                                                                    "isSettingDescription":  false,
                                                                                                    "showAsSectionHeader":  false,
                                                                                                    "dataType":  8,
-                                                                                                   "category":  135,
+                                                                                                   "category":  136,
                                                                                                    "nameResourceKey":  "bootOptionsName",
                                                                                                    "childSettings":  [
 
@@ -312,12 +568,12 @@
 
                                                                                                                ],
                                                                                                    "booleanActions":  0,
-                                                                                                   "policyType":  107,
+                                                                                                   "policyType":  108,
                                                                                                    "enabled":  true
                                                                                                },
                                                                                                {
                                                                                                    "dataType":  16,
-                                                                                                   "category":  135,
+                                                                                                   "category":  136,
                                                                                                    "nameResourceKey":  "bootFromExternalMediaName",
                                                                                                    "descriptionResourceKey":  "bootFromExternalMediaDescription",
                                                                                                    "childSettings":  [
@@ -344,12 +600,12 @@
                                                                                                    "booleanActions":  0,
                                                                                                    "defaultValue":  "notConfigured",
                                                                                                    "unconfiguredValue":  "notConfigured",
-                                                                                                   "policyType":  107,
+                                                                                                   "policyType":  108,
                                                                                                    "enabled":  true
                                                                                                },
                                                                                                {
                                                                                                    "dataType":  16,
-                                                                                                   "category":  135,
+                                                                                                   "category":  136,
                                                                                                    "nameResourceKey":  "bootFromBuiltInNetworkAdaptersName",
                                                                                                    "descriptionResourceKey":  "bootFromBuiltInNetworkAdaptersDescription",
                                                                                                    "childSettings":  [
@@ -376,8 +632,184 @@
                                                                                                    "booleanActions":  0,
                                                                                                    "defaultValue":  "notConfigured",
                                                                                                    "unconfiguredValue":  "notConfigured",
-                                                                                                   "policyType":  107,
+                                                                                                   "policyType":  108,
                                                                                                    "enabled":  true
+                                                                                               },
+                                                                                               {
+                                                                                                   "isSettingDescription":  false,
+                                                                                                   "showAsSectionHeader":  false,
+                                                                                                   "dataType":  8,
+                                                                                                   "category":  136,
+                                                                                                   "nameResourceKey":  "portName",
+                                                                                                   "childSettings":  [
+
+                                                                                                                     ],
+                                                                                                   "options":  [
+
+                                                                                                               ],
+                                                                                                   "booleanActions":  0,
+                                                                                                   "policyType":  108,
+                                                                                                   "enabled":  false
+                                                                                               },
+                                                                                               {
+                                                                                                   "dataType":  16,
+                                                                                                   "category":  136,
+                                                                                                   "nameResourceKey":  "usbTypeAPortName",
+                                                                                                   "descriptionResourceKey":  "usbTypeAPortDescription",
+                                                                                                   "childSettings":  [
+
+                                                                                                                     ],
+                                                                                                   "options":  [
+                                                                                                                   {
+                                                                                                                       "nameResourceKey":  "notConfigured",
+                                                                                                                       "value":  "notConfigured",
+                                                                                                                       "enabled":  true
+                                                                                                                   },
+                                                                                                                   {
+                                                                                                                       "nameResourceKey":  "enabledOption",
+                                                                                                                       "value":  "enabled",
+                                                                                                                       "enabled":  true
+                                                                                                                   },
+                                                                                                                   {
+                                                                                                                       "nameResourceKey":  "disabledOption",
+                                                                                                                       "value":  "disabled",
+                                                                                                                       "enabled":  true
+                                                                                                                   }
+                                                                                                               ],
+                                                                                                   "entityKey":  "usbTypeAPort",
+                                                                                                   "booleanActions":  0,
+                                                                                                   "defaultValue":  "notConfigured",
+                                                                                                   "unconfiguredValue":  "notConfigured",
+                                                                                                   "policyType":  108,
+                                                                                                   "enabled":  false
+                                                                                               },
+                                                                                               {
+                                                                                                   "dataType":  16,
+                                                                                                   "category":  136,
+                                                                                                   "nameResourceKey":  "usbTypeCPortName",
+                                                                                                   "descriptionResourceKey":  "usbTypeCPortDescription",
+                                                                                                   "childSettings":  [
+
+                                                                                                                     ],
+                                                                                                   "options":  [
+                                                                                                                   {
+                                                                                                                       "nameResourceKey":  "notConfigured",
+                                                                                                                       "value":  "notConfigured",
+                                                                                                                       "enabled":  true
+                                                                                                                   },
+                                                                                                                   {
+                                                                                                                       "nameResourceKey":  "enabledOption",
+                                                                                                                       "value":  "enabled",
+                                                                                                                       "enabled":  true
+                                                                                                                   },
+                                                                                                                   {
+                                                                                                                       "nameResourceKey":  "disabledOption",
+                                                                                                                       "value":  "disabled",
+                                                                                                                       "enabled":  true
+                                                                                                                   }
+                                                                                                               ],
+                                                                                                   "entityKey":  "usbTypeCPort",
+                                                                                                   "booleanActions":  0,
+                                                                                                   "defaultValue":  "notConfigured",
+                                                                                                   "unconfiguredValue":  "notConfigured",
+                                                                                                   "policyType":  108,
+                                                                                                   "enabled":  false
+                                                                                               },
+                                                                                               {
+                                                                                                   "dataType":  16,
+                                                                                                   "category":  136,
+                                                                                                   "nameResourceKey":  "sdCardName",
+                                                                                                   "descriptionResourceKey":  "sdCardDescription",
+                                                                                                   "childSettings":  [
+
+                                                                                                                     ],
+                                                                                                   "options":  [
+                                                                                                                   {
+                                                                                                                       "nameResourceKey":  "notConfigured",
+                                                                                                                       "value":  "notConfigured",
+                                                                                                                       "enabled":  true
+                                                                                                                   },
+                                                                                                                   {
+                                                                                                                       "nameResourceKey":  "enabledOption",
+                                                                                                                       "value":  "enabled",
+                                                                                                                       "enabled":  true
+                                                                                                                   },
+                                                                                                                   {
+                                                                                                                       "nameResourceKey":  "disabledOption",
+                                                                                                                       "value":  "disabled",
+                                                                                                                       "enabled":  true
+                                                                                                                   }
+                                                                                                               ],
+                                                                                                   "entityKey":  "sdCard",
+                                                                                                   "booleanActions":  0,
+                                                                                                   "defaultValue":  "notConfigured",
+                                                                                                   "unconfiguredValue":  "notConfigured",
+                                                                                                   "policyType":  108,
+                                                                                                   "enabled":  false
+                                                                                               },
+                                                                                               {
+                                                                                                   "dataType":  16,
+                                                                                                   "category":  136,
+                                                                                                   "nameResourceKey":  "wakeOnLANName",
+                                                                                                   "descriptionResourceKey":  "wakeOnLANDescription",
+                                                                                                   "childSettings":  [
+
+                                                                                                                     ],
+                                                                                                   "options":  [
+                                                                                                                   {
+                                                                                                                       "nameResourceKey":  "notConfigured",
+                                                                                                                       "value":  "notConfigured",
+                                                                                                                       "enabled":  true
+                                                                                                                   },
+                                                                                                                   {
+                                                                                                                       "nameResourceKey":  "enabledOption",
+                                                                                                                       "value":  "enabled",
+                                                                                                                       "enabled":  true
+                                                                                                                   },
+                                                                                                                   {
+                                                                                                                       "nameResourceKey":  "disabledOption",
+                                                                                                                       "value":  "disabled",
+                                                                                                                       "enabled":  true
+                                                                                                                   }
+                                                                                                               ],
+                                                                                                   "entityKey":  "wakeOnLAN",
+                                                                                                   "booleanActions":  0,
+                                                                                                   "defaultValue":  "notConfigured",
+                                                                                                   "unconfiguredValue":  "notConfigured",
+                                                                                                   "policyType":  108,
+                                                                                                   "enabled":  false
+                                                                                               },
+                                                                                               {
+                                                                                                   "dataType":  16,
+                                                                                                   "category":  136,
+                                                                                                   "nameResourceKey":  "wakeOnPowerName",
+                                                                                                   "descriptionResourceKey":  "wakeOnPowerDescription",
+                                                                                                   "childSettings":  [
+
+                                                                                                                     ],
+                                                                                                   "options":  [
+                                                                                                                   {
+                                                                                                                       "nameResourceKey":  "notConfigured",
+                                                                                                                       "value":  "notConfigured",
+                                                                                                                       "enabled":  true
+                                                                                                                   },
+                                                                                                                   {
+                                                                                                                       "nameResourceKey":  "enabledOption",
+                                                                                                                       "value":  "enabled",
+                                                                                                                       "enabled":  true
+                                                                                                                   },
+                                                                                                                   {
+                                                                                                                       "nameResourceKey":  "disabledOption",
+                                                                                                                       "value":  "disabled",
+                                                                                                                       "enabled":  true
+                                                                                                                   }
+                                                                                                               ],
+                                                                                                   "entityKey":  "wakeOnPower",
+                                                                                                   "booleanActions":  0,
+                                                                                                   "defaultValue":  "notConfigured",
+                                                                                                   "unconfiguredValue":  "notConfigured",
+                                                                                                   "policyType":  108,
+                                                                                                   "enabled":  false
                                                                                                }
                                                                                            ]
 }

Documentation/ObjectInfo/deviceguard_windows10endpointprotection.json

@@ -13,7 +13,7 @@
 
                                                                     ],
                                                         "booleanActions":  0,
-                                                        "policyType":  76,
+                                                        "policyType":  77,
                                                         "enabled":  true
                                                     },
                                                     {
@@ -60,7 +60,7 @@
 
                                                                                                                                                       ],
                                                                                                                                           "booleanActions":  0,
-                                                                                                                                          "policyType":  76,
+                                                                                                                                          "policyType":  77,
                                                                                                                                           "enabled":  true
                                                                                                                                       }
                                                                                                                                   ],
@@ -83,7 +83,7 @@
 
                                                                                                                                                       ],
                                                                                                                                           "booleanActions":  0,
-                                                                                                                                          "policyType":  76,
+                                                                                                                                          "policyType":  77,
                                                                                                                                           "enabled":  true
                                                                                                                                       }
                                                                                                                                   ],
@@ -94,7 +94,7 @@
                                                                                                  "booleanActions":  0,
                                                                                                  "defaultValue":  "enforceComponentsAndStoreApps",
                                                                                                  "unconfiguredValue":  "notConfigured",
-                                                                                                 "policyType":  76,
+                                                                                                 "policyType":  77,
                                                                                                  "enabled":  true
                                                                                              }
                                                                                          ],
@@ -130,7 +130,7 @@
 
                                                                                                                                                       ],
                                                                                                                                           "booleanActions":  0,
-                                                                                                                                          "policyType":  76,
+                                                                                                                                          "policyType":  77,
                                                                                                                                           "enabled":  true
                                                                                                                                       }
                                                                                                                                   ],
@@ -153,7 +153,7 @@
 
                                                                                                                                                       ],
                                                                                                                                           "booleanActions":  0,
-                                                                                                                                          "policyType":  76,
+                                                                                                                                          "policyType":  77,
                                                                                                                                           "enabled":  true
                                                                                                                                       }
                                                                                                                                   ],
@@ -164,7 +164,7 @@
                                                                                                  "booleanActions":  0,
                                                                                                  "defaultValue":  "auditComponentsAndStoreApps",
                                                                                                  "unconfiguredValue":  "notConfigured",
-                                                                                                 "policyType":  76,
+                                                                                                 "policyType":  77,
                                                                                                  "enabled":  true
                                                                                              }
                                                                                          ],
@@ -174,7 +174,7 @@
                                                         "entityKey":  "appLockerApplicationControlType",
                                                         "booleanActions":  0,
                                                         "defaultValue":  "notConfigured",
-                                                        "policyType":  76,
+                                                        "policyType":  77,
                                                         "enabled":  true
                                                     }
                                                 ]

Documentation/ObjectInfo/devicehealth_complianceandroidforwork.json

@@ -117,11 +117,69 @@
                                                                                                 {
                                                                                                     "nameResourceKey":  "androidSafetyNetbasicIntegrity",
                                                                                                     "value":  "basicIntegrity",
+                                                                                                    "children":  [
+                                                                                                                     {
+                                                                                                                         "dataType":  16,
+                                                                                                                         "category":  36,
+                                                                                                                         "nameResourceKey":  "requiredAndroidSafetyNetEvaluationTypeName",
+                                                                                                                         "descriptionResourceKey":  "requiredAndroidSafetyNetEvaluationTypeDescription",
+                                                                                                                         "childSettings":  [
+
+                                                                                                                                           ],
+                                                                                                                         "options":  [
+                                                                                                                                         {
+                                                                                                                                             "nameResourceKey":  "requiredAndroidSafetyNetEvaluationTypeBasic",
+                                                                                                                                             "value":  "basic",
+                                                                                                                                             "enabled":  true
+                                                                                                                                         },
+                                                                                                                                         {
+                                                                                                                                             "nameResourceKey":  "requiredAndroidSafetyNetEvaluationTypeHardwareBacked",
+                                                                                                                                             "value":  "hardwareBacked",
+                                                                                                                                             "enabled":  true
+                                                                                                                                         }
+                                                                                                                                     ],
+                                                                                                                         "entityKey":  "securityRequiredAndroidSafetyNetEvaluationType",
+                                                                                                                         "booleanActions":  0,
+                                                                                                                         "defaultValue":  "basic",
+                                                                                                                         "unconfiguredValue":  "basic",
+                                                                                                                         "policyType":  30,
+                                                                                                                         "enabled":  false
+                                                                                                                     }
+                                                                                                                 ],
                                                                                                     "enabled":  true
                                                                                                 },
                                                                                                 {
                                                                                                     "nameResourceKey":  "androidSafetyNetBasicIntegrityAndCertified",
                                                                                                     "value":  "basicIntegrityAndCertified",
+                                                                                                    "children":  [
+                                                                                                                     {
+                                                                                                                         "dataType":  16,
+                                                                                                                         "category":  36,
+                                                                                                                         "nameResourceKey":  "requiredAndroidSafetyNetEvaluationTypeName",
+                                                                                                                         "descriptionResourceKey":  "requiredAndroidSafetyNetEvaluationTypeDescription",
+                                                                                                                         "childSettings":  [
+
+                                                                                                                                           ],
+                                                                                                                         "options":  [
+                                                                                                                                         {
+                                                                                                                                             "nameResourceKey":  "requiredAndroidSafetyNetEvaluationTypeBasic",
+                                                                                                                                             "value":  "basic",
+                                                                                                                                             "enabled":  true
+                                                                                                                                         },
+                                                                                                                                         {
+                                                                                                                                             "nameResourceKey":  "requiredAndroidSafetyNetEvaluationTypeHardwareBacked",
+                                                                                                                                             "value":  "hardwareBacked",
+                                                                                                                                             "enabled":  true
+                                                                                                                                         }
+                                                                                                                                     ],
+                                                                                                                         "entityKey":  "securityRequiredAndroidSafetyNetEvaluationType",
+                                                                                                                         "booleanActions":  0,
+                                                                                                                         "defaultValue":  "basic",
+                                                                                                                         "unconfiguredValue":  "basic",
+                                                                                                                         "policyType":  30,
+                                                                                                                         "enabled":  false
+                                                                                                                     }
+                                                                                                                 ],
                                                                                                     "enabled":  true
                                                                                                 }
                                                                                             ],

Documentation/ObjectInfo/devicehealth_complianceaospdeviceowner.json

@@ -0,0 +1,19 @@
+{
+    "devicehealth_complianceaospdeviceowner":  {
+                                                   "dataType":  0,
+                                                   "category":  36,
+                                                   "nameResourceKey":  "complianceRootedAllowedName",
+                                                   "descriptionResourceKey":  "complianceRootedAllowedDescription",
+                                                   "childSettings":  [
+
+                                                                     ],
+                                                   "options":  [
+
+                                                               ],
+                                                   "entityKey":  "securityBlockJailbrokenDevices",
+                                                   "booleanActions":  3,
+                                                   "defaultValue":  false,
+                                                   "policyType":  32,
+                                                   "enabled":  true
+                                               }
+}

Documentation/ObjectInfo/devicerestrictions_androiddeviceownergeneral.json

@@ -113,23 +113,6 @@
                                                                                        "policyType":  2,
                                                                                        "enabled":  true
                                                                                    },
-                                                                                   {
-                                                                                       "dataType":  0,
-                                                                                       "category":  41,
-                                                                                       "nameResourceKey":  "safeBootDisabledName",
-                                                                                       "descriptionResourceKey":  "safeBootDisabledDescription",
-                                                                                       "childSettings":  [
-
-                                                                                                         ],
-                                                                                       "options":  [
-
-                                                                                                   ],
-                                                                                       "entityKey":  "safeBootBlocked",
-                                                                                       "booleanActions":  3,
-                                                                                       "defaultValue":  false,
-                                                                                       "policyType":  2,
-                                                                                       "enabled":  true
-                                                                                   },
                                                                                    {
                                                                                        "dataType":  0,
                                                                                        "category":  41,
@@ -252,19 +235,19 @@
                                                                                    {
                                                                                        "dataType":  0,
                                                                                        "category":  41,
-                                                                                       "nameResourceKey":  "debuggingFeaturesAllowedName",
+                                                                                       "nameResourceKey":  "securityDeveloperSettingsEnabledName",
-                                                                                       "descriptionResourceKey":  "debuggingFeaturesAllowedDescription",
+                                                                                       "descriptionResourceKey":  "securityDeveloperSettingsEnabledDescription",
                                                                                        "childSettings":  [
 
                                                                                                          ],
                                                                                        "options":  [
 
                                                                                                    ],
-                                                                                       "entityKey":  "securityAllowDebuggingFeatures",
+                                                                                       "entityKey":  "securityDeveloperSettingsEnabled",
                                                                                        "booleanActions":  0,
                                                                                        "defaultValue":  false,
                                                                                        "policyType":  2,
-                                                                                       "enabled":  true
+                                                                                       "enabled":  false
                                                                                    },
                                                                                    {
                                                                                        "dataType":  0,
@@ -878,6 +861,62 @@
                                                                                        "unconfiguredValue":  "deviceDefault",
                                                                                        "policyType":  2,
                                                                                        "enabled":  true
+                                                                                   },
+                                                                                   {
+                                                                                       "columns":  [
+                                                                                                       {
+                                                                                                           "metadata":  {
+                                                                                                                            "dataType":  20,
+                                                                                                                            "category":  41,
+                                                                                                                            "nameResourceKey":  "systemUpdateFreezePeriodStartDateColumnName",
+                                                                                                                            "descriptionResourceKey":  "systemUpdateFreezePeriodStartDateColumnDescription",
+                                                                                                                            "emptyValueResourceKey":  "systemUpdateFreezePeriodStartDateEmptyValueKey",
+                                                                                                                            "childSettings":  [
+
+                                                                                                                                              ],
+                                                                                                                            "options":  [
+
+                                                                                                                                        ],
+                                                                                                                            "entityKey":  "startDate",
+                                                                                                                            "booleanActions":  0,
+                                                                                                                            "policyType":  2,
+                                                                                                                            "enabled":  true
+                                                                                                                        }
+                                                                                                       },
+                                                                                                       {
+                                                                                                           "metadata":  {
+                                                                                                                            "dataType":  20,
+                                                                                                                            "category":  41,
+                                                                                                                            "nameResourceKey":  "systemUpdateFreezePeriodEndDateColumnName",
+                                                                                                                            "descriptionResourceKey":  "systemUpdateFreezePeriodEndDateColumnDescription",
+                                                                                                                            "emptyValueResourceKey":  "systemUpdateFreezePeriodEndDateEmptyValueKey",
+                                                                                                                            "childSettings":  [
+
+                                                                                                                                              ],
+                                                                                                                            "options":  [
+
+                                                                                                                                        ],
+                                                                                                                            "entityKey":  "endDate",
+                                                                                                                            "booleanActions":  0,
+                                                                                                                            "policyType":  2,
+                                                                                                                            "enabled":  true
+                                                                                                                        }
+                                                                                                       }
+                                                                                                   ],
+                                                                                       "dataType":  21,
+                                                                                       "category":  41,
+                                                                                       "nameResourceKey":  "systemUpdateFreezePeriodsTableName",
+                                                                                       "descriptionResourceKey":  "systemUpdateFreezePeriodsTableDescription",
+                                                                                       "childSettings":  [
+
+                                                                                                         ],
+                                                                                       "options":  [
+
+                                                                                                   ],
+                                                                                       "entityKey":  "systemUpdateFreezePeriodsList",
+                                                                                       "booleanActions":  0,
+                                                                                       "policyType":  2,
+                                                                                       "enabled":  true
                                                                                    }
                                                                                ],
                                                              "options":  [
@@ -1169,6 +1208,120 @@
                                                              "booleanActions":  0,
                                                              "policyType":  2,
                                                              "enabled":  true
+                                                         },
+                                                         {
+                                                             "isSettingDescription":  false,
+                                                             "showAsSectionHeader":  true,
+                                                             "dataType":  8,
+                                                             "category":  41,
+                                                             "nameResourceKey":  "workProfileAndroidEnrollmentTypesHeaderName",
+                                                             "descriptionResourceKey":  "workProfileAndroidEnrollmentTypesHeaderDescription",
+                                                             "childSettings":  [
+                                                                                   {
+                                                                                       "dataType":  0,
+                                                                                       "category":  41,
+                                                                                       "nameResourceKey":  "workProfileBlockContactSharingViaBluetoothName",
+                                                                                       "descriptionResourceKey":  "workProfileBlockContactSharingViaBluetoothDescription",
+                                                                                       "childSettings":  [
+
+                                                                                                         ],
+                                                                                       "options":  [
+
+                                                                                                   ],
+                                                                                       "entityKey":  "bluetoothBlockContactSharing",
+                                                                                       "booleanActions":  3,
+                                                                                       "defaultValue":  false,
+                                                                                       "policyType":  2,
+                                                                                       "enabled":  true
+                                                                                   },
+                                                                                   {
+                                                                                       "dataType":  19,
+                                                                                       "category":  41,
+                                                                                       "nameResourceKey":  "showWorkContactsInPersonalProfileName",
+                                                                                       "descriptionResourceKey":  "showWorkContactsInPersonalProfileDescription",
+                                                                                       "childSettings":  [
+
+                                                                                                         ],
+                                                                                       "options":  [
+                                                                                                       {
+                                                                                                           "nameResourceKey":  "blockOption",
+                                                                                                           "value":  false,
+                                                                                                           "enabled":  true
+                                                                                                       },
+                                                                                                       {
+                                                                                                           "nameResourceKey":  "notConfigured",
+                                                                                                           "value":  true,
+                                                                                                           "enabled":  true
+                                                                                                       }
+                                                                                                   ],
+                                                                                       "entityKey":  "crossProfilePoliciesShowWorkContactsInPersonalProfile",
+                                                                                       "booleanActions":  0,
+                                                                                       "defaultValue":  true,
+                                                                                       "unconfiguredValue":  true,
+                                                                                       "policyType":  2,
+                                                                                       "enabled":  true
+                                                                                   },
+                                                                                   {
+                                                                                       "dataType":  0,
+                                                                                       "category":  41,
+                                                                                       "nameResourceKey":  "copyPasteBetweenWorkAndPersonalProfilesName",
+                                                                                       "descriptionResourceKey":  "copyPasteBetweenWorkAndPersonalProfilesDescription",
+                                                                                       "childSettings":  [
+
+                                                                                                         ],
+                                                                                       "options":  [
+
+                                                                                                   ],
+                                                                                       "entityKey":  "crossProfilePoliciesAllowCopyPaste",
+                                                                                       "booleanActions":  0,
+                                                                                       "defaultValue":  false,
+                                                                                       "policyType":  2,
+                                                                                       "enabled":  true
+                                                                                   },
+                                                                                   {
+                                                                                       "dataType":  16,
+                                                                                       "category":  41,
+                                                                                       "nameResourceKey":  "dataSharingBetweenWorkAndPersonalProfilesName",
+                                                                                       "descriptionResourceKey":  "dataSharingBetweenWorkAndPersonalProfilesDescription",
+                                                                                       "childSettings":  [
+
+                                                                                                         ],
+                                                                                       "options":  [
+                                                                                                       {
+                                                                                                           "nameResourceKey":  "DeviceDefaultDataSharingBetweenWorkAndPersonalProfilesOption",
+                                                                                                           "value":  "notConfigured",
+                                                                                                           "enabled":  true
+                                                                                                       },
+                                                                                                       {
+                                                                                                           "nameResourceKey":  "BlockAllDataSharingBetweenWorkAndPersonalProfilesOption",
+                                                                                                           "value":  "crossProfileDataSharingBlocked",
+                                                                                                           "enabled":  true
+                                                                                                       },
+                                                                                                       {
+                                                                                                           "nameResourceKey":  "BlockWorkToPersonalDataSharingBetweenWorkAndPersonalProfilesOption",
+                                                                                                           "value":  "dataSharingFromWorkToPersonalBlocked",
+                                                                                                           "enabled":  true
+                                                                                                       },
+                                                                                                       {
+                                                                                                           "nameResourceKey":  "NoRestrictionsDataSharingBetweenWorkAndPersonalProfilesOption",
+                                                                                                           "value":  "crossProfileDataSharingAllowed",
+                                                                                                           "enabled":  true
+                                                                                                       }
+                                                                                                   ],
+                                                                                       "entityKey":  "crossProfilePoliciesAllowDataSharing",
+                                                                                       "booleanActions":  0,
+                                                                                       "defaultValue":  "notConfigured",
+                                                                                       "unconfiguredValue":  "notConfigured",
+                                                                                       "policyType":  2,
+                                                                                       "enabled":  true
+                                                                                   }
+                                                                               ],
+                                                             "options":  [
+
+                                                                         ],
+                                                             "booleanActions":  0,
+                                                             "policyType":  2,
+                                                             "enabled":  true
                                                          }
                                                      ]
 }

Documentation/ObjectInfo/devicerestrictions_androiddeviceownerwifi.json

@@ -258,6 +258,43 @@
                                                                                                                                         "policyType":  9,
                                                                                                                                         "enabled":  true
                                                                                                                                     },
+                                                                                                                                    {
+                                                                                                                                        "columns":  [
+                                                                                                                                                        {
+                                                                                                                                                            "metadata":  {
+                                                                                                                                                                             "dataType":  20,
+                                                                                                                                                                             "category":  41,
+                                                                                                                                                                             "nameResourceKey":  "empty",
+                                                                                                                                                                             "descriptionResourceKey":  "empty",
+                                                                                                                                                                             "emptyValueResourceKey":  "trustedServerCertificateNameExample",
+                                                                                                                                                                             "childSettings":  [
+
+                                                                                                                                                                                               ],
+                                                                                                                                                                             "options":  [
+
+                                                                                                                                                                                         ],
+                                                                                                                                                                             "entityKey":  "trustedServerCertificateNamesName",
+                                                                                                                                                                             "booleanActions":  0,
+                                                                                                                                                                             "policyType":  9,
+                                                                                                                                                                             "enabled":  true
+                                                                                                                                                                         }
+                                                                                                                                                        }
+                                                                                                                                                    ],
+                                                                                                                                        "dataType":  21,
+                                                                                                                                        "category":  41,
+                                                                                                                                        "nameResourceKey":  "androidTrustedServerCertificateNamesName",
+                                                                                                                                        "descriptionResourceKey":  "androidTrustedServerCertificateNamesDescription",
+                                                                                                                                        "childSettings":  [
+
+                                                                                                                                                          ],
+                                                                                                                                        "options":  [
+
+                                                                                                                                                    ],
+                                                                                                                                        "entityKey":  "trustedServerCertificateNames",
+                                                                                                                                        "booleanActions":  0,
+                                                                                                                                        "policyType":  9,
+                                                                                                                                        "enabled":  true
+                                                                                                                                    },
                                                                                                                                     {
                                                                                                                                         "complexOptions":  [
                                                                                                                                                                {
@@ -275,7 +312,24 @@
                                                                                                                                                                    "booleanActions":  0,
                                                                                                                                                                    "unconfiguredValue":  "notConfigured",
                                                                                                                                                                    "policyType":  9,
-                                                                                                                                                                   "enabled":  true
+                                                                                                                                                                   "enabled":  false
+                                                                                                                                                               },
+                                                                                                                                                               {
+                                                                                                                                                                   "dataType":  4,
+                                                                                                                                                                   "category":  41,
+                                                                                                                                                                   "nameResourceKey":  "selectCertificateProfile",
+                                                                                                                                                                   "descriptionResourceKey":  "selectRootCertificateForServerValidationName",
+                                                                                                                                                                   "childSettings":  [
+
+                                                                                                                                                                                     ],
+                                                                                                                                                                   "options":  [
+
+                                                                                                                                                                               ],
+                                                                                                                                                                   "entityKey":  "rootCertificateForServerValidation",
+                                                                                                                                                                   "booleanActions":  0,
+                                                                                                                                                                   "unconfiguredValue":  "notConfigured",
+                                                                                                                                                                   "policyType":  9,
+                                                                                                                                                                   "enabled":  false
                                                                                                                                                                }
                                                                                                                                                            ],
                                                                                                                                         "dataType":  5,
@@ -390,7 +444,23 @@
                                                                                                                                                                                                             "entityKey":  "identityCertificateForClientAuthentication",
                                                                                                                                                                                                             "booleanActions":  0,
                                                                                                                                                                                                             "policyType":  9,
-                                                                                                                                                                                                            "enabled":  true
+                                                                                                                                                                                                            "enabled":  false
+                                                                                                                                                                                                        },
+                                                                                                                                                                                                        {
+                                                                                                                                                                                                            "dataType":  4,
+                                                                                                                                                                                                            "category":  41,
+                                                                                                                                                                                                            "nameResourceKey":  "certificatesOption",
+                                                                                                                                                                                                            "descriptionResourceKey":  "empty",
+                                                                                                                                                                                                            "childSettings":  [
+
+                                                                                                                                                                                                                              ],
+                                                                                                                                                                                                            "options":  [
+
+                                                                                                                                                                                                                        ],
+                                                                                                                                                                                                            "entityKey":  "identityCertificateForClientAuthentication",
+                                                                                                                                                                                                            "booleanActions":  0,
+                                                                                                                                                                                                            "policyType":  9,
+                                                                                                                                                                                                            "enabled":  false
                                                                                                                                                                                                         }
                                                                                                                                                                                                     ],
                                                                                                                                                                                  "dataType":  5,
@@ -458,6 +528,43 @@
                                                                                                                                         "policyType":  9,
                                                                                                                                         "enabled":  true
                                                                                                                                     },
+                                                                                                                                    {
+                                                                                                                                        "columns":  [
+                                                                                                                                                        {
+                                                                                                                                                            "metadata":  {
+                                                                                                                                                                             "dataType":  20,
+                                                                                                                                                                             "category":  41,
+                                                                                                                                                                             "nameResourceKey":  "empty",
+                                                                                                                                                                             "descriptionResourceKey":  "empty",
+                                                                                                                                                                             "emptyValueResourceKey":  "trustedServerCertificateNameExample",
+                                                                                                                                                                             "childSettings":  [
+
+                                                                                                                                                                                               ],
+                                                                                                                                                                             "options":  [
+
+                                                                                                                                                                                         ],
+                                                                                                                                                                             "entityKey":  "trustedServerCertificateNamesName",
+                                                                                                                                                                             "booleanActions":  0,
+                                                                                                                                                                             "policyType":  9,
+                                                                                                                                                                             "enabled":  true
+                                                                                                                                                                         }
+                                                                                                                                                        }
+                                                                                                                                                    ],
+                                                                                                                                        "dataType":  21,
+                                                                                                                                        "category":  41,
+                                                                                                                                        "nameResourceKey":  "androidTrustedServerCertificateNamesName",
+                                                                                                                                        "descriptionResourceKey":  "androidTrustedServerCertificateNamesDescription",
+                                                                                                                                        "childSettings":  [
+
+                                                                                                                                                          ],
+                                                                                                                                        "options":  [
+
+                                                                                                                                                    ],
+                                                                                                                                        "entityKey":  "trustedServerCertificateNames",
+                                                                                                                                        "booleanActions":  0,
+                                                                                                                                        "policyType":  9,
+                                                                                                                                        "enabled":  true
+                                                                                                                                    },
                                                                                                                                     {
                                                                                                                                         "complexOptions":  [
                                                                                                                                                                {
@@ -475,7 +582,24 @@
                                                                                                                                                                    "booleanActions":  0,
                                                                                                                                                                    "unconfiguredValue":  "notConfigured",
                                                                                                                                                                    "policyType":  9,
-                                                                                                                                                                   "enabled":  true
+                                                                                                                                                                   "enabled":  false
+                                                                                                                                                               },
+                                                                                                                                                               {
+                                                                                                                                                                   "dataType":  4,
+                                                                                                                                                                   "category":  41,
+                                                                                                                                                                   "nameResourceKey":  "selectCertificateProfile",
+                                                                                                                                                                   "descriptionResourceKey":  "selectRootCertificateForServerValidationName",
+                                                                                                                                                                   "childSettings":  [
+
+                                                                                                                                                                                     ],
+                                                                                                                                                                   "options":  [
+
+                                                                                                                                                                               ],
+                                                                                                                                                                   "entityKey":  "rootCertificateForServerValidation",
+                                                                                                                                                                   "booleanActions":  0,
+                                                                                                                                                                   "unconfiguredValue":  "notConfigured",
+                                                                                                                                                                   "policyType":  9,
+                                                                                                                                                                   "enabled":  false
                                                                                                                                                                }
                                                                                                                                                            ],
                                                                                                                                         "dataType":  5,
@@ -648,7 +772,23 @@
                                                                                                                                                                                                             "entityKey":  "identityCertificateForClientAuthentication",
                                                                                                                                                                                                             "booleanActions":  0,
                                                                                                                                                                                                             "policyType":  9,
-                                                                                                                                                                                                            "enabled":  true
+                                                                                                                                                                                                            "enabled":  false
+                                                                                                                                                                                                        },
+                                                                                                                                                                                                        {
+                                                                                                                                                                                                            "dataType":  4,
+                                                                                                                                                                                                            "category":  41,
+                                                                                                                                                                                                            "nameResourceKey":  "certificatesOption",
+                                                                                                                                                                                                            "descriptionResourceKey":  "empty",
+                                                                                                                                                                                                            "childSettings":  [
+
+                                                                                                                                                                                                                              ],
+                                                                                                                                                                                                            "options":  [
+
+                                                                                                                                                                                                                        ],
+                                                                                                                                                                                                            "entityKey":  "identityCertificateForClientAuthentication",
+                                                                                                                                                                                                            "booleanActions":  0,
+                                                                                                                                                                                                            "policyType":  9,
+                                                                                                                                                                                                            "enabled":  false
                                                                                                                                                                                                         }
                                                                                                                                                                                                     ],
                                                                                                                                                                                  "dataType":  5,
@@ -716,6 +856,43 @@
                                                                                                                                         "policyType":  9,
                                                                                                                                         "enabled":  true
                                                                                                                                     },
+                                                                                                                                    {
+                                                                                                                                        "columns":  [
+                                                                                                                                                        {
+                                                                                                                                                            "metadata":  {
+                                                                                                                                                                             "dataType":  20,
+                                                                                                                                                                             "category":  41,
+                                                                                                                                                                             "nameResourceKey":  "empty",
+                                                                                                                                                                             "descriptionResourceKey":  "empty",
+                                                                                                                                                                             "emptyValueResourceKey":  "trustedServerCertificateNameExample",
+                                                                                                                                                                             "childSettings":  [
+
+                                                                                                                                                                                               ],
+                                                                                                                                                                             "options":  [
+
+                                                                                                                                                                                         ],
+                                                                                                                                                                             "entityKey":  "trustedServerCertificateNamesName",
+                                                                                                                                                                             "booleanActions":  0,
+                                                                                                                                                                             "policyType":  9,
+                                                                                                                                                                             "enabled":  true
+                                                                                                                                                                         }
+                                                                                                                                                        }
+                                                                                                                                                    ],
+                                                                                                                                        "dataType":  21,
+                                                                                                                                        "category":  41,
+                                                                                                                                        "nameResourceKey":  "androidTrustedServerCertificateNamesName",
+                                                                                                                                        "descriptionResourceKey":  "androidTrustedServerCertificateNamesDescription",
+                                                                                                                                        "childSettings":  [
+
+                                                                                                                                                          ],
+                                                                                                                                        "options":  [
+
+                                                                                                                                                    ],
+                                                                                                                                        "entityKey":  "trustedServerCertificateNames",
+                                                                                                                                        "booleanActions":  0,
+                                                                                                                                        "policyType":  9,
+                                                                                                                                        "enabled":  true
+                                                                                                                                    },
                                                                                                                                     {
                                                                                                                                         "complexOptions":  [
                                                                                                                                                                {
@@ -733,7 +910,24 @@
                                                                                                                                                                    "booleanActions":  0,
                                                                                                                                                                    "unconfiguredValue":  "notConfigured",
                                                                                                                                                                    "policyType":  9,
-                                                                                                                                                                   "enabled":  true
+                                                                                                                                                                   "enabled":  false
+                                                                                                                                                               },
+                                                                                                                                                               {
+                                                                                                                                                                   "dataType":  4,
+                                                                                                                                                                   "category":  41,
+                                                                                                                                                                   "nameResourceKey":  "selectCertificateProfile",
+                                                                                                                                                                   "descriptionResourceKey":  "selectRootCertificateForServerValidationName",
+                                                                                                                                                                   "childSettings":  [
+
+                                                                                                                                                                                     ],
+                                                                                                                                                                   "options":  [
+
+                                                                                                                                                                               ],
+                                                                                                                                                                   "entityKey":  "rootCertificateForServerValidation",
+                                                                                                                                                                   "booleanActions":  0,
+                                                                                                                                                                   "unconfiguredValue":  "notConfigured",
+                                                                                                                                                                   "policyType":  9,
+                                                                                                                                                                   "enabled":  false
                                                                                                                                                                }
                                                                                                                                                            ],
                                                                                                                                         "dataType":  5,
@@ -899,7 +1093,23 @@
                                                                                                                                                                                                             "entityKey":  "identityCertificateForClientAuthentication",
                                                                                                                                                                                                             "booleanActions":  0,
                                                                                                                                                                                                             "policyType":  9,
-                                                                                                                                                                                                            "enabled":  true
+                                                                                                                                                                                                            "enabled":  false
+                                                                                                                                                                                                        },
+                                                                                                                                                                                                        {
+                                                                                                                                                                                                            "dataType":  4,
+                                                                                                                                                                                                            "category":  41,
+                                                                                                                                                                                                            "nameResourceKey":  "certificatesOption",
+                                                                                                                                                                                                            "descriptionResourceKey":  "empty",
+                                                                                                                                                                                                            "childSettings":  [
+
+                                                                                                                                                                                                                              ],
+                                                                                                                                                                                                            "options":  [
+
+                                                                                                                                                                                                                        ],
+                                                                                                                                                                                                            "entityKey":  "identityCertificateForClientAuthentication",
+                                                                                                                                                                                                            "booleanActions":  0,
+                                                                                                                                                                                                            "policyType":  9,
+                                                                                                                                                                                                            "enabled":  false
                                                                                                                                                                                                         }
                                                                                                                                                                                                     ],
                                                                                                                                                                                  "dataType":  5,

Documentation/ObjectInfo/devicerestrictions_aospdeviceownerdevice.json

@@ -85,40 +85,6 @@
                                                          "policyType":  28,
                                                          "enabled":  true
                                                      },
-                                                     {
-                                                         "dataType":  0,
-                                                         "category":  41,
-                                                         "nameResourceKey":  "blockStorageUsbName",
-                                                         "descriptionResourceKey":  "blockStorageUsbDescription",
-                                                         "childSettings":  [
-
-                                                                           ],
-                                                         "options":  [
-
-                                                                     ],
-                                                         "entityKey":  "storageAllowUsb",
-                                                         "booleanActions":  9,
-                                                         "defaultValue":  false,
-                                                         "policyType":  28,
-                                                         "enabled":  true
-                                                     },
-                                                     {
-                                                         "dataType":  0,
-                                                         "category":  41,
-                                                         "nameResourceKey":  "blockBackupServiceName",
-                                                         "descriptionResourceKey":  "blockBackupServiceDescription",
-                                                         "childSettings":  [
-
-                                                                           ],
-                                                         "options":  [
-
-                                                                     ],
-                                                         "entityKey":  "backupBlocked",
-                                                         "booleanActions":  9,
-                                                         "defaultValue":  false,
-                                                         "policyType":  28,
-                                                         "enabled":  true
-                                                     },
                                                      {
                                                          "dataType":  0,
                                                          "category":  41,
@@ -170,57 +136,6 @@
                                                          "policyType":  28,
                                                          "enabled":  true
                                                      },
-                                                     {
-                                                         "dataType":  0,
-                                                         "category":  41,
-                                                         "nameResourceKey":  "blockBluetoothContactSharingName",
-                                                         "descriptionResourceKey":  "blockBluetoothContactSharingDescription",
-                                                         "childSettings":  [
-
-                                                                           ],
-                                                         "options":  [
-
-                                                                     ],
-                                                         "entityKey":  "bluetoothBlockContactSharing",
-                                                         "booleanActions":  9,
-                                                         "defaultValue":  false,
-                                                         "policyType":  28,
-                                                         "enabled":  true
-                                                     },
-                                                     {
-                                                         "dataType":  0,
-                                                         "category":  41,
-                                                         "nameResourceKey":  "blockCellularWiFiTetheringName",
-                                                         "descriptionResourceKey":  "blockCellularWiFiTetheringDescription",
-                                                         "childSettings":  [
-
-                                                                           ],
-                                                         "options":  [
-
-                                                                     ],
-                                                         "entityKey":  "cellularBlockWiFiTethering",
-                                                         "booleanActions":  9,
-                                                         "defaultValue":  false,
-                                                         "policyType":  28,
-                                                         "enabled":  true
-                                                     },
-                                                     {
-                                                         "dataType":  0,
-                                                         "category":  41,
-                                                         "nameResourceKey":  "allowAppsInstallFromUnknownSourcesName",
-                                                         "descriptionResourceKey":  "allowAppsInstallFromUnknownSourcesDescription",
-                                                         "childSettings":  [
-
-                                                                           ],
-                                                         "options":  [
-
-                                                                     ],
-                                                         "entityKey":  "appsAllowInstallFromUnknownSources",
-                                                         "booleanActions":  9,
-                                                         "defaultValue":  false,
-                                                         "policyType":  28,
-                                                         "enabled":  true
-                                                     },
                                                      {
                                                          "dataType":  0,
                                                          "category":  41,
@@ -237,6 +152,23 @@
                                                          "defaultValue":  false,
                                                          "policyType":  28,
                                                          "enabled":  true
+                                                     },
+                                                     {
+                                                         "dataType":  0,
+                                                         "category":  41,
+                                                         "nameResourceKey":  "blockAppsInstallFromUnknownSourcesName",
+                                                         "descriptionResourceKey":  "blockAppsInstallFromUnknownSourcesDescription",
+                                                         "childSettings":  [
+
+                                                                           ],
+                                                         "options":  [
+
+                                                                     ],
+                                                         "entityKey":  "appsBlockInstallFromUnknownSources",
+                                                         "booleanActions":  9,
+                                                         "defaultValue":  false,
+                                                         "policyType":  28,
+                                                         "enabled":  true
                                                      }
                                                  ]
 }

Documentation/ObjectInfo/devicerestrictions_iosgeneral.json

@@ -22,7 +22,7 @@
                                                                         "entityKey":  "diagnosticDataBlockSubmission",
                                                                         "booleanActions":  9,
                                                                         "defaultValue":  false,
-                                                                        "policyType":  45,
+                                                                        "policyType":  46,
                                                                         "enabled":  true
                                                                     },
                                                                     {
@@ -38,7 +38,7 @@
                                                                         "entityKey":  "screenCaptureBlocked",
                                                                         "booleanActions":  9,
                                                                         "defaultValue":  false,
-                                                                        "policyType":  45,
+                                                                        "policyType":  46,
                                                                         "enabled":  true
                                                                     }
                                                                 ],
@@ -46,7 +46,7 @@
 
                                                           ],
                                               "booleanActions":  0,
-                                              "policyType":  45,
+                                              "policyType":  46,
                                               "enabled":  true
                                           },
                                           {
@@ -71,7 +71,7 @@
                                                                         "entityKey":  "certificatesBlockUntrustedTlsCertificates",
                                                                         "booleanActions":  9,
                                                                         "defaultValue":  false,
-                                                                        "policyType":  45,
+                                                                        "policyType":  46,
                                                                         "enabled":  true
                                                                     },
                                                                     {
@@ -88,7 +88,7 @@
                                                                         "entityKey":  "pkiBlockOTAUpdates",
                                                                         "booleanActions":  9,
                                                                         "defaultValue":  false,
-                                                                        "policyType":  45,
+                                                                        "policyType":  46,
                                                                         "enabled":  true
                                                                     },
                                                                     {
@@ -105,7 +105,7 @@
                                                                         "entityKey":  "privacyForceLimitAdTracking",
                                                                         "booleanActions":  9,
                                                                         "defaultValue":  false,
-                                                                        "policyType":  45,
+                                                                        "policyType":  46,
                                                                         "enabled":  true
                                                                     },
                                                                     {
@@ -122,24 +122,7 @@
                                                                         "entityKey":  "enterpriseAppBlockTrust",
                                                                         "booleanActions":  9,
                                                                         "defaultValue":  false,
-                                                                        "policyType":  45,
+                                                                        "policyType":  46,
-                                                                        "enabled":  true
-                                                                    },
-                                                                    {
-                                                                        "dataType":  0,
-                                                                        "category":  41,
-                                                                        "nameResourceKey":  "blockAppClipsName",
-                                                                        "descriptionResourceKey":  "blockAppClipsDescription",
-                                                                        "childSettings":  [
-
-                                                                                          ],
-                                                                        "options":  [
-
-                                                                                    ],
-                                                                        "entityKey":  "appClipsBlocked",
-                                                                        "booleanActions":  9,
-                                                                        "defaultValue":  false,
-                                                                        "policyType":  45,
                                                                         "enabled":  true
                                                                     },
                                                                     {
@@ -156,7 +139,7 @@
                                                                         "entityKey":  "applePersonalizedAdsBlocked",
                                                                         "booleanActions":  9,
                                                                         "defaultValue":  false,
-                                                                        "policyType":  45,
+                                                                        "policyType":  46,
                                                                         "enabled":  true
                                                                     }
                                                                 ],
@@ -164,7 +147,7 @@
 
                                                           ],
                                               "booleanActions":  0,
-                                              "policyType":  45,
+                                              "policyType":  46,
                                               "enabled":  true
                                           },
                                           {
@@ -189,7 +172,7 @@
                                                                         "entityKey":  "diagnosticDataBlockSubmissionModification",
                                                                         "booleanActions":  9,
                                                                         "defaultValue":  false,
-                                                                        "policyType":  45,
+                                                                        "policyType":  46,
                                                                         "enabled":  true
                                                                     },
                                                                     {
@@ -206,7 +189,7 @@
                                                                         "entityKey":  "classroomAppBlockRemoteScreenObservation",
                                                                         "booleanActions":  9,
                                                                         "defaultValue":  false,
-                                                                        "policyType":  45,
+                                                                        "policyType":  46,
                                                                         "enabled":  true
                                                                     },
                                                                     {
@@ -223,7 +206,7 @@
                                                                         "entityKey":  "classroomAppForceUnpromptedScreenObservation",
                                                                         "booleanActions":  9,
                                                                         "defaultValue":  false,
-                                                                        "policyType":  45,
+                                                                        "policyType":  46,
                                                                         "enabled":  true
                                                                     },
                                                                     {
@@ -239,7 +222,7 @@
                                                                         "entityKey":  "accountBlockModification",
                                                                         "booleanActions":  9,
                                                                         "defaultValue":  false,
-                                                                        "policyType":  45,
+                                                                        "policyType":  46,
                                                                         "enabled":  true
                                                                     },
                                                                     {
@@ -256,14 +239,14 @@
                                                                         "entityKey":  "deviceBlockEnableRestrictions",
                                                                         "booleanActions":  9,
                                                                         "defaultValue":  false,
-                                                                        "policyType":  45,
+                                                                        "policyType":  46,
                                                                         "enabled":  true
                                                                     },
                                                                     {
                                                                         "dataType":  0,
                                                                         "category":  41,
-                                                                        "nameResourceKey":  "blockDeviceEraseContentAndSettingsName",
+                                                                        "nameResourceKey":  "blockDeviceEraseContentAndSettingsIosName",
-                                                                        "descriptionResourceKey":  "blockDeviceEraseContentAndSettingsDescription",
+                                                                        "descriptionResourceKey":  "blockDeviceEraseContentAndSettingsIosDescription",
                                                                         "childSettings":  [
 
                                                                                           ],
@@ -273,7 +256,7 @@
                                                                         "entityKey":  "deviceBlockEraseContentAndSettings",
                                                                         "booleanActions":  9,
                                                                         "defaultValue":  false,
-                                                                        "policyType":  45,
+                                                                        "policyType":  46,
                                                                         "enabled":  true
                                                                     },
                                                                     {
@@ -289,7 +272,7 @@
                                                                         "entityKey":  "deviceBlockNameModification",
                                                                         "booleanActions":  9,
                                                                         "defaultValue":  false,
-                                                                        "policyType":  45,
+                                                                        "policyType":  46,
                                                                         "enabled":  true
                                                                     },
                                                                     {
@@ -305,7 +288,7 @@
                                                                         "entityKey":  "notificationsBlockSettingsModification",
                                                                         "booleanActions":  9,
                                                                         "defaultValue":  false,
-                                                                        "policyType":  45,
+                                                                        "policyType":  46,
                                                                         "enabled":  true
                                                                     },
                                                                     {
@@ -322,7 +305,7 @@
                                                                         "entityKey":  "wallpaperBlockModification",
                                                                         "booleanActions":  9,
                                                                         "defaultValue":  false,
-                                                                        "policyType":  45,
+                                                                        "policyType":  46,
                                                                         "enabled":  true
                                                                     },
                                                                     {
@@ -338,7 +321,7 @@
                                                                         "entityKey":  "configurationProfileBlockChanges",
                                                                         "booleanActions":  9,
                                                                         "defaultValue":  false,
-                                                                        "policyType":  45,
+                                                                        "policyType":  46,
                                                                         "enabled":  true
                                                                     },
                                                                     {
@@ -355,7 +338,7 @@
                                                                         "entityKey":  "activationLockAllowWhenSupervised",
                                                                         "booleanActions":  9,
                                                                         "defaultValue":  false,
-                                                                        "policyType":  45,
+                                                                        "policyType":  46,
                                                                         "enabled":  true
                                                                     },
                                                                     {
@@ -372,7 +355,24 @@
                                                                         "entityKey":  "appRemovalBlocked",
                                                                         "booleanActions":  9,
                                                                         "defaultValue":  false,
-                                                                        "policyType":  45,
+                                                                        "policyType":  46,
+                                                                        "enabled":  true
+                                                                    },
+                                                                    {
+                                                                        "dataType":  0,
+                                                                        "category":  41,
+                                                                        "nameResourceKey":  "blockAppClipsName",
+                                                                        "descriptionResourceKey":  "blockAppClipsDescription",
+                                                                        "childSettings":  [
+
+                                                                                          ],
+                                                                        "options":  [
+
+                                                                                    ],
+                                                                        "entityKey":  "appClipsBlocked",
+                                                                        "booleanActions":  9,
+                                                                        "defaultValue":  false,
+                                                                        "policyType":  46,
                                                                         "enabled":  true
                                                                     },
                                                                     {
@@ -389,7 +389,7 @@
                                                                         "entityKey":  "usbRestrictedModeBlocked",
                                                                         "booleanActions":  9,
                                                                         "defaultValue":  false,
-                                                                        "policyType":  45,
+                                                                        "policyType":  46,
                                                                         "enabled":  true
                                                                     },
                                                                     {
@@ -406,7 +406,7 @@
                                                                         "entityKey":  "dateAndTimeForceSetAutomatically",
                                                                         "booleanActions":  9,
                                                                         "defaultValue":  false,
-                                                                        "policyType":  45,
+                                                                        "policyType":  46,
                                                                         "enabled":  true
                                                                     },
                                                                     {
@@ -423,7 +423,7 @@
                                                                         "entityKey":  "classroomForceRequestPermissionToLeaveClasses",
                                                                         "booleanActions":  9,
                                                                         "defaultValue":  false,
-                                                                        "policyType":  45,
+                                                                        "policyType":  46,
                                                                         "enabled":  true
                                                                     },
                                                                     {
@@ -440,7 +440,7 @@
                                                                         "entityKey":  "classroomForceUnpromptedAppAndDeviceLock",
                                                                         "booleanActions":  9,
                                                                         "defaultValue":  false,
-                                                                        "policyType":  45,
+                                                                        "policyType":  46,
                                                                         "enabled":  true
                                                                     },
                                                                     {
@@ -457,7 +457,7 @@
                                                                         "entityKey":  "classroomForceAutomaticallyJoinClasses",
                                                                         "booleanActions":  9,
                                                                         "defaultValue":  false,
-                                                                        "policyType":  45,
+                                                                        "policyType":  46,
                                                                         "enabled":  true
                                                                     },
                                                                     {
@@ -474,7 +474,7 @@
                                                                         "entityKey":  "vpnBlockCreation",
                                                                         "booleanActions":  9,
                                                                         "defaultValue":  false,
-                                                                        "policyType":  45,
+                                                                        "policyType":  46,
                                                                         "enabled":  true
                                                                     },
                                                                     {
@@ -491,7 +491,7 @@
                                                                         "entityKey":  "esimBlockModification",
                                                                         "booleanActions":  9,
                                                                         "defaultValue":  false,
-                                                                        "policyType":  45,
+                                                                        "policyType":  46,
                                                                         "enabled":  true
                                                                     },
                                                                     {
@@ -505,6 +505,7 @@
                                                                                                   "category":  41,
                                                                                                   "nameResourceKey":  "enforcedSoftwareUpdateDelayName",
                                                                                                   "descriptionResourceKey":  "enforcedSoftwareUpdateDelayDescription",
+                                                                                                  "emptyValueResourceKey":  "EnforcedSoftwareUpdateDelayNamePlaceholder",
                                                                                                   "childSettings":  [
 
                                                                                                                     ],
@@ -513,8 +514,7 @@
                                                                                                               ],
                                                                                                   "entityKey":  "softwareUpdatesEnforcedDelayInDays",
                                                                                                   "booleanActions":  0,
-                                                                                                  "defaultValue":  30,
+                                                                                                  "policyType":  46,
-                                                                                                  "policyType":  45,
                                                                                                   "enabled":  true
                                                                                               }
                                                                                           ],
@@ -524,7 +524,7 @@
                                                                         "entityKey":  "softwareUpdatesForceDelayed",
                                                                         "booleanActions":  9,
                                                                         "defaultValue":  false,
-                                                                        "policyType":  45,
+                                                                        "policyType":  46,
                                                                         "enabled":  true
                                                                     }
                                                                 ],
@@ -532,7 +532,7 @@
 
                                                           ],
                                               "booleanActions":  0,
-                                              "policyType":  45,
+                                              "policyType":  46,
                                               "enabled":  true
                                           }
                                       ]

Documentation/ObjectInfo/devicerestrictions_macgeneral.json

@@ -22,7 +22,7 @@
                                                                         "entityKey":  "definitionLookupBlocked",
                                                                         "booleanActions":  9,
                                                                         "defaultValue":  false,
-                                                                        "policyType":  60,
+                                                                        "policyType":  61,
                                                                         "enabled":  true
                                                                     },
                                                                     {
@@ -39,7 +39,7 @@
                                                                         "entityKey":  "keyboardBlockDictation",
                                                                         "booleanActions":  9,
                                                                         "defaultValue":  false,
-                                                                        "policyType":  60,
+                                                                        "policyType":  61,
                                                                         "enabled":  true
                                                                     },
                                                                     {
@@ -55,7 +55,7 @@
                                                                         "entityKey":  "contentCachingBlocked",
                                                                         "booleanActions":  9,
                                                                         "defaultValue":  false,
-                                                                        "policyType":  60,
+                                                                        "policyType":  61,
                                                                         "enabled":  true
                                                                     },
                                                                     {
@@ -71,7 +71,7 @@
                                                                         "entityKey":  "screenCaptureBlocked",
                                                                         "booleanActions":  9,
                                                                         "defaultValue":  false,
-                                                                        "policyType":  60,
+                                                                        "policyType":  61,
                                                                         "enabled":  true
                                                                     }
                                                                 ],
@@ -79,7 +79,7 @@
 
                                                           ],
                                               "booleanActions":  0,
-                                              "policyType":  60,
+                                              "policyType":  61,
                                               "enabled":  true
                                           },
                                           {
@@ -91,7 +91,7 @@
                                               "descriptionResourceKey":  "userApprovedAndAutomatedDeviceEnrollmentHeaderDescriptionMac",
                                               "childSettings":  [
                                                                     {
-                                                                        "dataType":  13,
+                                                                        "dataType":  16,
                                                                         "category":  41,
                                                                         "nameResourceKey":  "updateDelayPolicyName",
                                                                         "descriptionResourceKey":  "updateDelayPolicyDescription",
@@ -100,14 +100,20 @@
                                                                                           ],
                                                                         "options":  [
                                                                                         {
-                                                                                            "nameResourceKey":  "delayOSUpdateVisibilityOption",
+                                                                                            "nameResourceKey":  "notConfigured",
-                                                                                            "value":  "delayOSUpdateVisibility",
+                                                                                            "value":  "none",
+                                                                                            "enabled":  true
+                                                                                        },
+                                                                                        {
+                                                                                            "nameResourceKey":  "delayMajorOSUpdateVisibilityOption",
+                                                                                            "value":  "delayMajorOsUpdateVisibility",
                                                                                             "children":  [
                                                                                                              {
                                                                                                                  "dataType":  14,
                                                                                                                  "category":  41,
                                                                                                                  "nameResourceKey":  "enforcedSoftwareUpdateDelayName",
                                                                                                                  "descriptionResourceKey":  "enforcedSoftwareUpdateDelayDescription",
+                                                                                                                 "emptyValueResourceKey":  "enforcedSoftwareUpdateDelayEmptyValue",
                                                                                                                  "childSettings":  [
 
                                                                                                                                    ],
@@ -116,8 +122,65 @@
                                                                                                                              ],
                                                                                                                  "entityKey":  "softwareUpdatesEnforcedDelayInDays",
                                                                                                                  "booleanActions":  0,
-                                                                                                                 "defaultValue":  30,
+                                                                                                                 "policyType":  61,
-                                                                                                                 "policyType":  60,
+                                                                                                                 "enabled":  true
+                                                                                                             },
+                                                                                                             {
+                                                                                                                 "dataType":  14,
+                                                                                                                 "category":  41,
+                                                                                                                 "nameResourceKey":  "softwareUpdateMajorOSDeferredInstallDelayName",
+                                                                                                                 "descriptionResourceKey":  "softwareUpdateMajorOSDeferredInstallDelayDescription",
+                                                                                                                 "emptyValueResourceKey":  "enforcedSoftwareUpdateDelayEmptyValue",
+                                                                                                                 "childSettings":  [
+
+                                                                                                                                   ],
+                                                                                                                 "options":  [
+
+                                                                                                                             ],
+                                                                                                                 "entityKey":  "softwareUpdateMajorOSDeferredInstallDelayInDays",
+                                                                                                                 "booleanActions":  0,
+                                                                                                                 "policyType":  61,
+                                                                                                                 "enabled":  true
+                                                                                                             }
+                                                                                                         ],
+                                                                                            "enabled":  true
+                                                                                        },
+                                                                                        {
+                                                                                            "nameResourceKey":  "delayMinorOSUpdateVisibilityOption",
+                                                                                            "value":  "delayOSUpdateVisibility",
+                                                                                            "children":  [
+                                                                                                             {
+                                                                                                                 "dataType":  14,
+                                                                                                                 "category":  41,
+                                                                                                                 "nameResourceKey":  "enforcedSoftwareUpdateDelayName",
+                                                                                                                 "descriptionResourceKey":  "enforcedSoftwareUpdateDelayDescription",
+                                                                                                                 "emptyValueResourceKey":  "enforcedSoftwareUpdateDelayEmptyValue",
+                                                                                                                 "childSettings":  [
+
+                                                                                                                                   ],
+                                                                                                                 "options":  [
+
+                                                                                                                             ],
+                                                                                                                 "entityKey":  "softwareUpdatesEnforcedDelayInDays",
+                                                                                                                 "booleanActions":  0,
+                                                                                                                 "policyType":  61,
+                                                                                                                 "enabled":  true
+                                                                                                             },
+                                                                                                             {
+                                                                                                                 "dataType":  14,
+                                                                                                                 "category":  41,
+                                                                                                                 "nameResourceKey":  "softwareUpdateMinorOSDeferredInstallDelayName",
+                                                                                                                 "descriptionResourceKey":  "softwareUpdateMinorOSDeferredInstallDelayDescription",
+                                                                                                                 "emptyValueResourceKey":  "enforcedSoftwareUpdateDelayEmptyValue",
+                                                                                                                 "childSettings":  [
+
+                                                                                                                                   ],
+                                                                                                                 "options":  [
+
+                                                                                                                             ],
+                                                                                                                 "entityKey":  "softwareUpdateMinorOSDeferredInstallDelayInDays",
+                                                                                                                 "booleanActions":  0,
+                                                                                                                 "policyType":  61,
                                                                                                                  "enabled":  true
                                                                                                              }
                                                                                                          ],
@@ -132,6 +195,7 @@
                                                                                                                  "category":  41,
                                                                                                                  "nameResourceKey":  "enforcedSoftwareUpdateDelayName",
                                                                                                                  "descriptionResourceKey":  "enforcedSoftwareUpdateDelayDescription",
+                                                                                                                 "emptyValueResourceKey":  "enforcedSoftwareUpdateDelayEmptyValue",
                                                                                                                  "childSettings":  [
 
                                                                                                                                    ],
@@ -140,8 +204,273 @@
                                                                                                                              ],
                                                                                                                  "entityKey":  "softwareUpdatesEnforcedDelayInDays",
                                                                                                                  "booleanActions":  0,
-                                                                                                                 "defaultValue":  30,
+                                                                                                                 "policyType":  61,
-                                                                                                                 "policyType":  60,
+                                                                                                                 "enabled":  true
+                                                                                                             },
+                                                                                                             {
+                                                                                                                 "dataType":  14,
+                                                                                                                 "category":  41,
+                                                                                                                 "nameResourceKey":  "softwareUpdateNonOSDeferredInstallDelayName",
+                                                                                                                 "descriptionResourceKey":  "softwareUpdateNonOSDeferredInstallDelayDescription",
+                                                                                                                 "emptyValueResourceKey":  "enforcedSoftwareUpdateDelayEmptyValue",
+                                                                                                                 "childSettings":  [
+
+                                                                                                                                   ],
+                                                                                                                 "options":  [
+
+                                                                                                                             ],
+                                                                                                                 "entityKey":  "softwareUpdateNonOSDeferredInstallDelayInDays",
+                                                                                                                 "booleanActions":  0,
+                                                                                                                 "policyType":  61,
+                                                                                                                 "enabled":  true
+                                                                                                             }
+                                                                                                         ],
+                                                                                            "enabled":  true
+                                                                                        },
+                                                                                        {
+                                                                                            "nameResourceKey":  "delayMajorAndMinorOSUpdateVisibilityOption",
+                                                                                            "value":  "delayOSUpdateVisibility,delayMajorOsUpdateVisibility",
+                                                                                            "children":  [
+                                                                                                             {
+                                                                                                                 "dataType":  14,
+                                                                                                                 "category":  41,
+                                                                                                                 "nameResourceKey":  "enforcedSoftwareUpdateDelayName",
+                                                                                                                 "descriptionResourceKey":  "enforcedSoftwareUpdateDelayDescription",
+                                                                                                                 "emptyValueResourceKey":  "enforcedSoftwareUpdateDelayEmptyValue",
+                                                                                                                 "childSettings":  [
+
+                                                                                                                                   ],
+                                                                                                                 "options":  [
+
+                                                                                                                             ],
+                                                                                                                 "entityKey":  "softwareUpdatesEnforcedDelayInDays",
+                                                                                                                 "booleanActions":  0,
+                                                                                                                 "policyType":  61,
+                                                                                                                 "enabled":  true
+                                                                                                             },
+                                                                                                             {
+                                                                                                                 "dataType":  14,
+                                                                                                                 "category":  41,
+                                                                                                                 "nameResourceKey":  "softwareUpdateMajorOSDeferredInstallDelayName",
+                                                                                                                 "descriptionResourceKey":  "softwareUpdateMajorOSDeferredInstallDelayDescription",
+                                                                                                                 "emptyValueResourceKey":  "enforcedSoftwareUpdateDelayEmptyValue",
+                                                                                                                 "childSettings":  [
+
+                                                                                                                                   ],
+                                                                                                                 "options":  [
+
+                                                                                                                             ],
+                                                                                                                 "entityKey":  "softwareUpdateMajorOSDeferredInstallDelayInDays",
+                                                                                                                 "booleanActions":  0,
+                                                                                                                 "policyType":  61,
+                                                                                                                 "enabled":  true
+                                                                                                             },
+                                                                                                             {
+                                                                                                                 "dataType":  14,
+                                                                                                                 "category":  41,
+                                                                                                                 "nameResourceKey":  "softwareUpdateMinorOSDeferredInstallDelayName",
+                                                                                                                 "descriptionResourceKey":  "softwareUpdateMinorOSDeferredInstallDelayDescription",
+                                                                                                                 "emptyValueResourceKey":  "enforcedSoftwareUpdateDelayEmptyValue",
+                                                                                                                 "childSettings":  [
+
+                                                                                                                                   ],
+                                                                                                                 "options":  [
+
+                                                                                                                             ],
+                                                                                                                 "entityKey":  "softwareUpdateMinorOSDeferredInstallDelayInDays",
+                                                                                                                 "booleanActions":  0,
+                                                                                                                 "policyType":  61,
+                                                                                                                 "enabled":  true
+                                                                                                             }
+                                                                                                         ],
+                                                                                            "enabled":  true
+                                                                                        },
+                                                                                        {
+                                                                                            "nameResourceKey":  "delayMajorAndNonOsUpdateVisibilityOption",
+                                                                                            "value":  "delayAppUpdateVisibility,delayMajorOsUpdateVisibility",
+                                                                                            "children":  [
+                                                                                                             {
+                                                                                                                 "dataType":  14,
+                                                                                                                 "category":  41,
+                                                                                                                 "nameResourceKey":  "enforcedSoftwareUpdateDelayName",
+                                                                                                                 "descriptionResourceKey":  "enforcedSoftwareUpdateDelayDescription",
+                                                                                                                 "emptyValueResourceKey":  "enforcedSoftwareUpdateDelayEmptyValue",
+                                                                                                                 "childSettings":  [
+
+                                                                                                                                   ],
+                                                                                                                 "options":  [
+
+                                                                                                                             ],
+                                                                                                                 "entityKey":  "softwareUpdatesEnforcedDelayInDays",
+                                                                                                                 "booleanActions":  0,
+                                                                                                                 "policyType":  61,
+                                                                                                                 "enabled":  true
+                                                                                                             },
+                                                                                                             {
+                                                                                                                 "dataType":  14,
+                                                                                                                 "category":  41,
+                                                                                                                 "nameResourceKey":  "softwareUpdateMajorOSDeferredInstallDelayName",
+                                                                                                                 "descriptionResourceKey":  "softwareUpdateMajorOSDeferredInstallDelayDescription",
+                                                                                                                 "emptyValueResourceKey":  "enforcedSoftwareUpdateDelayEmptyValue",
+                                                                                                                 "childSettings":  [
+
+                                                                                                                                   ],
+                                                                                                                 "options":  [
+
+                                                                                                                             ],
+                                                                                                                 "entityKey":  "softwareUpdateMajorOSDeferredInstallDelayInDays",
+                                                                                                                 "booleanActions":  0,
+                                                                                                                 "policyType":  61,
+                                                                                                                 "enabled":  true
+                                                                                                             },
+                                                                                                             {
+                                                                                                                 "dataType":  14,
+                                                                                                                 "category":  41,
+                                                                                                                 "nameResourceKey":  "softwareUpdateNonOSDeferredInstallDelayName",
+                                                                                                                 "descriptionResourceKey":  "softwareUpdateNonOSDeferredInstallDelayDescription",
+                                                                                                                 "emptyValueResourceKey":  "enforcedSoftwareUpdateDelayEmptyValue",
+                                                                                                                 "childSettings":  [
+
+                                                                                                                                   ],
+                                                                                                                 "options":  [
+
+                                                                                                                             ],
+                                                                                                                 "entityKey":  "softwareUpdateNonOSDeferredInstallDelayInDays",
+                                                                                                                 "booleanActions":  0,
+                                                                                                                 "policyType":  61,
+                                                                                                                 "enabled":  true
+                                                                                                             }
+                                                                                                         ],
+                                                                                            "enabled":  true
+                                                                                        },
+                                                                                        {
+                                                                                            "nameResourceKey":  "delayMinorAndNonOSUpdateVisibilityOption",
+                                                                                            "value":  "delayOSUpdateVisibility,delayAppUpdateVisibility",
+                                                                                            "children":  [
+                                                                                                             {
+                                                                                                                 "dataType":  14,
+                                                                                                                 "category":  41,
+                                                                                                                 "nameResourceKey":  "enforcedSoftwareUpdateDelayName",
+                                                                                                                 "descriptionResourceKey":  "enforcedSoftwareUpdateDelayDescription",
+                                                                                                                 "emptyValueResourceKey":  "enforcedSoftwareUpdateDelayEmptyValue",
+                                                                                                                 "childSettings":  [
+
+                                                                                                                                   ],
+                                                                                                                 "options":  [
+
+                                                                                                                             ],
+                                                                                                                 "entityKey":  "softwareUpdatesEnforcedDelayInDays",
+                                                                                                                 "booleanActions":  0,
+                                                                                                                 "policyType":  61,
+                                                                                                                 "enabled":  true
+                                                                                                             },
+                                                                                                             {
+                                                                                                                 "dataType":  14,
+                                                                                                                 "category":  41,
+                                                                                                                 "nameResourceKey":  "softwareUpdateMinorOSDeferredInstallDelayName",
+                                                                                                                 "descriptionResourceKey":  "softwareUpdateMinorOSDeferredInstallDelayDescription",
+                                                                                                                 "emptyValueResourceKey":  "enforcedSoftwareUpdateDelayEmptyValue",
+                                                                                                                 "childSettings":  [
+
+                                                                                                                                   ],
+                                                                                                                 "options":  [
+
+                                                                                                                             ],
+                                                                                                                 "entityKey":  "softwareUpdateMinorOSDeferredInstallDelayInDays",
+                                                                                                                 "booleanActions":  0,
+                                                                                                                 "policyType":  61,
+                                                                                                                 "enabled":  true
+                                                                                                             },
+                                                                                                             {
+                                                                                                                 "dataType":  14,
+                                                                                                                 "category":  41,
+                                                                                                                 "nameResourceKey":  "softwareUpdateNonOSDeferredInstallDelayName",
+                                                                                                                 "descriptionResourceKey":  "softwareUpdateNonOSDeferredInstallDelayDescription",
+                                                                                                                 "emptyValueResourceKey":  "enforcedSoftwareUpdateDelayEmptyValue",
+                                                                                                                 "childSettings":  [
+
+                                                                                                                                   ],
+                                                                                                                 "options":  [
+
+                                                                                                                             ],
+                                                                                                                 "entityKey":  "softwareUpdateNonOSDeferredInstallDelayInDays",
+                                                                                                                 "booleanActions":  0,
+                                                                                                                 "policyType":  61,
+                                                                                                                 "enabled":  true
+                                                                                                             }
+                                                                                                         ],
+                                                                                            "enabled":  true
+                                                                                        },
+                                                                                        {
+                                                                                            "nameResourceKey":  "delayAllUpdateVisibilityOption",
+                                                                                            "value":  "delayOSUpdateVisibility,delayAppUpdateVisibility,delayMajorOsUpdateVisibility",
+                                                                                            "children":  [
+                                                                                                             {
+                                                                                                                 "dataType":  14,
+                                                                                                                 "category":  41,
+                                                                                                                 "nameResourceKey":  "enforcedSoftwareUpdateDelayName",
+                                                                                                                 "descriptionResourceKey":  "enforcedSoftwareUpdateDelayDescription",
+                                                                                                                 "emptyValueResourceKey":  "enforcedSoftwareUpdateDelayEmptyValue",
+                                                                                                                 "childSettings":  [
+
+                                                                                                                                   ],
+                                                                                                                 "options":  [
+
+                                                                                                                             ],
+                                                                                                                 "entityKey":  "softwareUpdatesEnforcedDelayInDays",
+                                                                                                                 "booleanActions":  0,
+                                                                                                                 "policyType":  61,
+                                                                                                                 "enabled":  true
+                                                                                                             },
+                                                                                                             {
+                                                                                                                 "dataType":  14,
+                                                                                                                 "category":  41,
+                                                                                                                 "nameResourceKey":  "softwareUpdateMajorOSDeferredInstallDelayName",
+                                                                                                                 "descriptionResourceKey":  "softwareUpdateMajorOSDeferredInstallDelayDescription",
+                                                                                                                 "emptyValueResourceKey":  "enforcedSoftwareUpdateDelayEmptyValue",
+                                                                                                                 "childSettings":  [
+
+                                                                                                                                   ],
+                                                                                                                 "options":  [
+
+                                                                                                                             ],
+                                                                                                                 "entityKey":  "softwareUpdateMajorOSDeferredInstallDelayInDays",
+                                                                                                                 "booleanActions":  0,
+                                                                                                                 "policyType":  61,
+                                                                                                                 "enabled":  true
+                                                                                                             },
+                                                                                                             {
+                                                                                                                 "dataType":  14,
+                                                                                                                 "category":  41,
+                                                                                                                 "nameResourceKey":  "softwareUpdateMinorOSDeferredInstallDelayName",
+                                                                                                                 "descriptionResourceKey":  "softwareUpdateMinorOSDeferredInstallDelayDescription",
+                                                                                                                 "emptyValueResourceKey":  "enforcedSoftwareUpdateDelayEmptyValue",
+                                                                                                                 "childSettings":  [
+
+                                                                                                                                   ],
+                                                                                                                 "options":  [
+
+                                                                                                                             ],
+                                                                                                                 "entityKey":  "softwareUpdateMinorOSDeferredInstallDelayInDays",
+                                                                                                                 "booleanActions":  0,
+                                                                                                                 "policyType":  61,
+                                                                                                                 "enabled":  true
+                                                                                                             },
+                                                                                                             {
+                                                                                                                 "dataType":  14,
+                                                                                                                 "category":  41,
+                                                                                                                 "nameResourceKey":  "softwareUpdateNonOSDeferredInstallDelayName",
+                                                                                                                 "descriptionResourceKey":  "softwareUpdateNonOSDeferredInstallDelayDescription",
+                                                                                                                 "emptyValueResourceKey":  "enforcedSoftwareUpdateDelayEmptyValue",
+                                                                                                                 "childSettings":  [
+
+                                                                                                                                   ],
+                                                                                                                 "options":  [
+
+                                                                                                                             ],
+                                                                                                                 "entityKey":  "softwareUpdateNonOSDeferredInstallDelayInDays",
+                                                                                                                 "booleanActions":  0,
+                                                                                                                 "policyType":  61,
                                                                                                                  "enabled":  true
                                                                                                              }
                                                                                                          ],
@@ -150,7 +479,8 @@
                                                                                     ],
                                                                         "entityKey":  "updateDelayPolicy",
                                                                         "booleanActions":  0,
-                                                                        "policyType":  60,
+                                                                        "defaultValue":  "none",
+                                                                        "policyType":  61,
                                                                         "enabled":  true
                                                                     }
                                                                 ],
@@ -158,7 +488,7 @@
 
                                                           ],
                                               "booleanActions":  0,
-                                              "policyType":  60,
+                                              "policyType":  61,
                                               "enabled":  true
                                           },
                                           {
@@ -183,7 +513,7 @@
                                                                         "entityKey":  "classroomAppBlockRemoteScreenObservation",
                                                                         "booleanActions":  9,
                                                                         "defaultValue":  false,
-                                                                        "policyType":  60,
+                                                                        "policyType":  61,
                                                                         "enabled":  true
                                                                     },
                                                                     {
@@ -200,7 +530,7 @@
                                                                         "entityKey":  "classroomAppForceUnpromptedScreenObservation",
                                                                         "booleanActions":  9,
                                                                         "defaultValue":  false,
-                                                                        "policyType":  60,
+                                                                        "policyType":  61,
                                                                         "enabled":  true
                                                                     },
                                                                     {
@@ -217,7 +547,7 @@
                                                                         "entityKey":  "classroomForceRequestPermissionToLeaveClasses",
                                                                         "booleanActions":  9,
                                                                         "defaultValue":  false,
-                                                                        "policyType":  60,
+                                                                        "policyType":  61,
                                                                         "enabled":  true
                                                                     },
                                                                     {
@@ -234,7 +564,7 @@
                                                                         "entityKey":  "classroomForceUnpromptedAppAndDeviceLock",
                                                                         "booleanActions":  9,
                                                                         "defaultValue":  false,
-                                                                        "policyType":  60,
+                                                                        "policyType":  61,
                                                                         "enabled":  true
                                                                     },
                                                                     {
@@ -251,7 +581,41 @@
                                                                         "entityKey":  "classroomForceAutomaticallyJoinClasses",
                                                                         "booleanActions":  9,
                                                                         "defaultValue":  false,
-                                                                        "policyType":  60,
+                                                                        "policyType":  61,
+                                                                        "enabled":  true
+                                                                    },
+                                                                    {
+                                                                        "dataType":  0,
+                                                                        "category":  41,
+                                                                        "nameResourceKey":  "wallpaperModificationBlockedMacName",
+                                                                        "descriptionResourceKey":  "wallpaperModificationBlockedMacDescription",
+                                                                        "childSettings":  [
+
+                                                                                          ],
+                                                                        "options":  [
+
+                                                                                    ],
+                                                                        "entityKey":  "wallpaperModificationBlocked",
+                                                                        "booleanActions":  9,
+                                                                        "defaultValue":  false,
+                                                                        "policyType":  61,
+                                                                        "enabled":  true
+                                                                    },
+                                                                    {
+                                                                        "dataType":  0,
+                                                                        "category":  41,
+                                                                        "nameResourceKey":  "blockDeviceEraseContentAndSettingsMacOsName",
+                                                                        "descriptionResourceKey":  "blockDeviceEraseContentAndSettingsMacOsDescription",
+                                                                        "childSettings":  [
+
+                                                                                          ],
+                                                                        "options":  [
+
+                                                                                    ],
+                                                                        "entityKey":  "eraseContentAndSettingsBlocked",
+                                                                        "booleanActions":  9,
+                                                                        "defaultValue":  false,
+                                                                        "policyType":  61,
                                                                         "enabled":  true
                                                                     }
                                                                 ],
@@ -259,7 +623,7 @@
 
                                                           ],
                                               "booleanActions":  0,
-                                              "policyType":  60,
+                                              "policyType":  61,
                                               "enabled":  true
                                           }
                                       ]

Documentation/ObjectInfo/devicerestrictions_windows10general.json

@@ -14,7 +14,7 @@
                                                     "entityKey":  "screenCaptureBlocked",
                                                     "booleanActions":  3,
                                                     "defaultValue":  false,
-                                                    "policyType":  78,
+                                                    "policyType":  79,
                                                     "enabled":  true
                                                 },
                                                 {
@@ -31,7 +31,7 @@
                                                     "entityKey":  "copyPasteBlocked",
                                                     "booleanActions":  3,
                                                     "defaultValue":  false,
-                                                    "policyType":  78,
+                                                    "policyType":  79,
                                                     "enabled":  true
                                                 },
                                                 {
@@ -48,7 +48,7 @@
                                                     "entityKey":  "deviceManagementBlockManualUnenroll",
                                                     "booleanActions":  3,
                                                     "defaultValue":  false,
-                                                    "policyType":  78,
+                                                    "policyType":  79,
                                                     "enabled":  true
                                                 },
                                                 {
@@ -65,7 +65,7 @@
                                                     "entityKey":  "certificatesBlockManualRootCertificateInstallation",
                                                     "booleanActions":  3,
                                                     "defaultValue":  false,
-                                                    "policyType":  78,
+                                                    "policyType":  79,
                                                     "enabled":  true
                                                 },
                                                 {
@@ -82,7 +82,7 @@
                                                     "entityKey":  "cameraBlocked",
                                                     "booleanActions":  3,
                                                     "defaultValue":  false,
-                                                    "policyType":  78,
+                                                    "policyType":  79,
                                                     "enabled":  true
                                                 },
                                                 {
@@ -99,7 +99,7 @@
                                                     "entityKey":  "oneDriveDisableFileSync",
                                                     "booleanActions":  3,
                                                     "defaultValue":  false,
-                                                    "policyType":  78,
+                                                    "policyType":  79,
                                                     "enabled":  true
                                                 },
                                                 {
@@ -116,7 +116,7 @@
                                                     "entityKey":  "storageBlockRemovableStorage",
                                                     "booleanActions":  3,
                                                     "defaultValue":  false,
-                                                    "policyType":  78,
+                                                    "policyType":  79,
                                                     "enabled":  true
                                                 },
                                                 {
@@ -133,7 +133,7 @@
                                                     "entityKey":  "locationServicesBlocked",
                                                     "booleanActions":  3,
                                                     "defaultValue":  false,
-                                                    "policyType":  78,
+                                                    "policyType":  79,
                                                     "enabled":  true
                                                 },
                                                 {
@@ -150,7 +150,7 @@
                                                     "entityKey":  "internetSharingBlocked",
                                                     "booleanActions":  3,
                                                     "defaultValue":  false,
-                                                    "policyType":  78,
+                                                    "policyType":  79,
                                                     "enabled":  true
                                                 },
                                                 {
@@ -167,7 +167,7 @@
                                                     "entityKey":  "deviceManagementBlockFactoryResetOnMobile",
                                                     "booleanActions":  3,
                                                     "defaultValue":  false,
-                                                    "policyType":  78,
+                                                    "policyType":  79,
                                                     "enabled":  true
                                                 },
                                                 {
@@ -184,7 +184,7 @@
                                                     "entityKey":  "usbBlocked",
                                                     "booleanActions":  3,
                                                     "defaultValue":  false,
-                                                    "policyType":  78,
+                                                    "policyType":  79,
                                                     "enabled":  true
                                                 },
                                                 {
@@ -201,7 +201,7 @@
                                                     "entityKey":  "antiTheftModeBlocked",
                                                     "booleanActions":  3,
                                                     "defaultValue":  false,
-                                                    "policyType":  78,
+                                                    "policyType":  79,
                                                     "enabled":  true
                                                 },
                                                 {
@@ -218,7 +218,7 @@
                                                     "entityKey":  "cortanaBlocked",
                                                     "booleanActions":  3,
                                                     "defaultValue":  false,
-                                                    "policyType":  78,
+                                                    "policyType":  79,
                                                     "enabled":  true
                                                 },
                                                 {
@@ -235,7 +235,7 @@
                                                     "entityKey":  "voiceRecordingBlocked",
                                                     "booleanActions":  3,
                                                     "defaultValue":  false,
-                                                    "policyType":  78,
+                                                    "policyType":  79,
                                                     "enabled":  true
                                                 },
                                                 {
@@ -252,7 +252,7 @@
                                                     "entityKey":  "settingsBlockEditDeviceName",
                                                     "booleanActions":  3,
                                                     "defaultValue":  false,
-                                                    "policyType":  78,
+                                                    "policyType":  79,
                                                     "enabled":  true
                                                 },
                                                 {
@@ -269,7 +269,7 @@
                                                     "entityKey":  "settingsBlockAddProvisioningPackage",
                                                     "booleanActions":  3,
                                                     "defaultValue":  false,
-                                                    "policyType":  78,
+                                                    "policyType":  79,
                                                     "enabled":  true
                                                 },
                                                 {
@@ -286,7 +286,7 @@
                                                     "entityKey":  "settingsBlockRemoveProvisioningPackage",
                                                     "booleanActions":  3,
                                                     "defaultValue":  false,
-                                                    "policyType":  78,
+                                                    "policyType":  79,
                                                     "enabled":  true
                                                 },
                                                 {
@@ -303,7 +303,7 @@
                                                     "entityKey":  "experienceBlockDeviceDiscovery",
                                                     "booleanActions":  3,
                                                     "defaultValue":  false,
-                                                    "policyType":  78,
+                                                    "policyType":  79,
                                                     "enabled":  true
                                                 },
                                                 {
@@ -320,7 +320,7 @@
                                                     "entityKey":  "experienceBlockTaskSwitcher",
                                                     "booleanActions":  3,
                                                     "defaultValue":  false,
-                                                    "policyType":  78,
+                                                    "policyType":  79,
                                                     "enabled":  true
                                                 },
                                                 {
@@ -337,7 +337,7 @@
                                                     "entityKey":  "experienceBlockErrorDialogWhenNoSIM",
                                                     "booleanActions":  3,
                                                     "defaultValue":  false,
-                                                    "policyType":  78,
+                                                    "policyType":  79,
                                                     "enabled":  true
                                                 },
                                                 {
@@ -369,7 +369,7 @@
                                                     "booleanActions":  0,
                                                     "defaultValue":  "notConfigured",
                                                     "unconfiguredValue":  "notConfigured",
-                                                    "policyType":  78,
+                                                    "policyType":  79,
                                                     "enabled":  true
                                                 },
                                                 {
@@ -386,7 +386,7 @@
                                                     "entityKey":  "enableAutomaticRedeployment",
                                                     "booleanActions":  0,
                                                     "defaultValue":  false,
-                                                    "policyType":  78,
+                                                    "policyType":  79,
                                                     "enabled":  true
                                                 },
                                                 {
@@ -403,7 +403,7 @@
                                                     "entityKey":  "tenantLockdownRequireNetworkDuringOutOfBoxExperience",
                                                     "booleanActions":  1,
                                                     "defaultValue":  false,
-                                                    "policyType":  78,
+                                                    "policyType":  79,
                                                     "enabled":  true
                                                 },
                                                 {
@@ -432,7 +432,7 @@
                                                                 ],
                                                     "entityKey":  "dataProtectionBlockDirectMemoryAccess",
                                                     "booleanActions":  0,
-                                                    "policyType":  78,
+                                                    "policyType":  79,
                                                     "enabled":  true
                                                 },
                                                 {
@@ -450,7 +450,7 @@
                                                     "booleanActions":  3,
                                                     "defaultValue":  false,
                                                     "unconfiguredValue":  false,
-                                                    "policyType":  78,
+                                                    "policyType":  79,
                                                     "enabled":  true
                                                 }
                                             ]

Documentation/ObjectInfo/devicerestrictions_windows8general.json

@@ -14,7 +14,7 @@
                                                    "entityKey":  "diagnosticsBlockDataSubmission",
                                                    "booleanActions":  3,
                                                    "defaultValue":  false,
-                                                   "policyType":  91,
+                                                   "policyType":  92,
                                                    "enabled":  true
                                                },
                                                {
@@ -30,7 +30,7 @@
                                                                ],
                                                    "entityKey":  "browserRequireFirewall",
                                                    "booleanActions":  1,
-                                                   "policyType":  91,
+                                                   "policyType":  92,
                                                    "enabled":  true
                                                },
                                                {
@@ -72,7 +72,7 @@
                                                    "booleanActions":  0,
                                                    "defaultValue":  "userDefined",
                                                    "unconfiguredValue":  "userDefined",
-                                                   "policyType":  91,
+                                                   "policyType":  92,
                                                    "enabled":  true
                                                }
                                            ]

Documentation/ObjectInfo/devicerestrictions_windowsphonegeneral.json

@@ -14,7 +14,7 @@
                                                        "entityKey":  "cameraBlocked",
                                                        "booleanActions":  3,
                                                        "defaultValue":  false,
-                                                       "policyType":  100,
+                                                       "policyType":  101,
                                                        "enabled":  true
                                                    },
                                                    {
@@ -31,7 +31,7 @@
                                                        "entityKey":  "appsBlockCopyPaste",
                                                        "booleanActions":  3,
                                                        "defaultValue":  false,
-                                                       "policyType":  100,
+                                                       "policyType":  101,
                                                        "enabled":  true
                                                    },
                                                    {
@@ -48,7 +48,7 @@
                                                        "entityKey":  "storageBlockRemovableStorage",
                                                        "booleanActions":  3,
                                                        "defaultValue":  false,
-                                                       "policyType":  100,
+                                                       "policyType":  101,
                                                        "enabled":  true
                                                    },
                                                    {
@@ -65,7 +65,7 @@
                                                        "entityKey":  "locationServicesBlocked",
                                                        "booleanActions":  3,
                                                        "defaultValue":  false,
-                                                       "policyType":  100,
+                                                       "policyType":  101,
                                                        "enabled":  true
                                                    },
                                                    {
@@ -82,7 +82,7 @@
                                                        "entityKey":  "microsoftAccountBlocked",
                                                        "booleanActions":  3,
                                                        "defaultValue":  false,
-                                                       "policyType":  100,
+                                                       "policyType":  101,
                                                        "enabled":  true
                                                    },
                                                    {
@@ -99,7 +99,7 @@
                                                        "entityKey":  "screenCaptureBlocked",
                                                        "booleanActions":  3,
                                                        "defaultValue":  false,
-                                                       "policyType":  100,
+                                                       "policyType":  101,
                                                        "enabled":  true
                                                    },
                                                    {
@@ -116,7 +116,7 @@
                                                        "entityKey":  "diagnosticDataBlockSubmission",
                                                        "booleanActions":  3,
                                                        "defaultValue":  false,
-                                                       "policyType":  100,
+                                                       "policyType":  101,
                                                        "enabled":  true
                                                    },
                                                    {
@@ -133,7 +133,7 @@
                                                        "entityKey":  "emailBlockAddingAccounts",
                                                        "booleanActions":  3,
                                                        "defaultValue":  false,
-                                                       "policyType":  100,
+                                                       "policyType":  101,
                                                        "enabled":  true
                                                    }
                                                ]

Documentation/ObjectInfo/display_windows10general.json

@@ -16,7 +16,7 @@
                                                                                           ],
                                                                               "entityKey":  "gdiAppListColumn",
                                                                               "booleanActions":  0,
-                                                                              "policyType":  78,
+                                                                              "policyType":  79,
                                                                               "enabled":  true
                                                                           }
                                                          }
@@ -33,7 +33,7 @@
                                                      ],
                                          "entityKey":  "displayAppListWithGdiDPIScalingTurnedOn",
                                          "booleanActions":  0,
-                                         "policyType":  78,
+                                         "policyType":  79,
                                          "enabled":  true
                                      },
                                      {
@@ -52,7 +52,7 @@
                                                                                           ],
                                                                               "entityKey":  "gdiAppListColumn",
                                                                               "booleanActions":  0,
-                                                                              "policyType":  78,
+                                                                              "policyType":  79,
                                                                               "enabled":  true
                                                                           }
                                                          }
@@ -69,7 +69,7 @@
                                                      ],
                                          "entityKey":  "displayAppListWithGdiDPIScalingTurnedOff",
                                          "booleanActions":  0,
-                                         "policyType":  78,
+                                         "policyType":  79,
                                          "enabled":  true
                                      }
                                  ]

Documentation/ObjectInfo/domainjoin_windowsdomainjoin.json

@@ -2,7 +2,7 @@
     "domainjoin_windowsdomainjoin":  [
                                          {
                                              "dataType":  20,
-                                             "category":  132,
+                                             "category":  133,
                                              "nameResourceKey":  "computerNameStaticPrefixName",
                                              "descriptionResourceKey":  "computerNameStaticPrefixDescription",
                                              "childSettings":  [
@@ -13,12 +13,12 @@
                                                          ],
                                              "entityKey":  "computerNameStaticPrefix",
                                              "booleanActions":  0,
-                                             "policyType":  105,
+                                             "policyType":  106,
                                              "enabled":  true
                                          },
                                          {
                                              "dataType":  20,
-                                             "category":  132,
+                                             "category":  133,
                                              "nameResourceKey":  "activeDirectoryDomainNameName",
                                              "descriptionResourceKey":  "activeDirectoryDomainNameDescription",
                                              "childSettings":  [
@@ -29,12 +29,12 @@
                                                          ],
                                              "entityKey":  "activeDirectoryDomainName",
                                              "booleanActions":  0,
-                                             "policyType":  105,
+                                             "policyType":  106,
                                              "enabled":  true
                                          },
                                          {
                                              "dataType":  20,
-                                             "category":  132,
+                                             "category":  133,
                                              "nameResourceKey":  "organizationalUnitName",
                                              "descriptionResourceKey":  "organizationalUnitDescription",
                                              "childSettings":  [
@@ -45,7 +45,7 @@
                                                          ],
                                              "entityKey":  "organizationalUnit",
                                              "booleanActions":  0,
-                                             "policyType":  105,
+                                             "policyType":  106,
                                              "enabled":  true
                                          }
                                      ]

Documentation/ObjectInfo/domains_iosgeneral.json

@@ -23,7 +23,7 @@
 
                                                                                                     ],
                                                                                         "booleanActions":  0,
-                                                                                        "policyType":  45,
+                                                                                        "policyType":  46,
                                                                                         "enabled":  true
                                                                                     },
                                                                                     {
@@ -42,7 +42,7 @@
                                                                                                                                          ],
                                                                                                                              "entityKey":  "emailInDomainSuffixes",
                                                                                                                              "booleanActions":  0,
-                                                                                                                             "policyType":  45,
+                                                                                                                             "policyType":  46,
                                                                                                                              "enabled":  true
                                                                                                                          }
                                                                                                         }
@@ -58,7 +58,7 @@
                                                                                                     ],
                                                                                         "entityKey":  "emailInDomainSuffixes",
                                                                                         "booleanActions":  0,
-                                                                                        "policyType":  45,
+                                                                                        "policyType":  46,
                                                                                         "enabled":  true
                                                                                     }
                                                                                 ],
@@ -72,7 +72,7 @@
 
                                                                          ],
                                                              "booleanActions":  0,
-                                                             "policyType":  45,
+                                                             "policyType":  46,
                                                              "enabled":  true
                                                          },
                                                          {
@@ -90,7 +90,7 @@
 
                                                                                                     ],
                                                                                         "booleanActions":  0,
-                                                                                        "policyType":  45,
+                                                                                        "policyType":  46,
                                                                                         "enabled":  true
                                                                                     },
                                                                                     {
@@ -109,7 +109,7 @@
                                                                                                                                          ],
                                                                                                                              "entityKey":  "safariManagedDomains",
                                                                                                                              "booleanActions":  0,
-                                                                                                                             "policyType":  45,
+                                                                                                                             "policyType":  46,
                                                                                                                              "enabled":  true
                                                                                                                          }
                                                                                                         }
@@ -125,7 +125,7 @@
                                                                                                     ],
                                                                                         "entityKey":  "safariManagedDomains",
                                                                                         "booleanActions":  0,
-                                                                                        "policyType":  45,
+                                                                                        "policyType":  46,
                                                                                         "enabled":  true
                                                                                     }
                                                                                 ],
@@ -139,7 +139,7 @@
 
                                                                          ],
                                                              "booleanActions":  0,
-                                                             "policyType":  45,
+                                                             "policyType":  46,
                                                              "enabled":  true
                                                          }
                                                      ],
@@ -147,7 +147,7 @@
 
                                                ],
                                    "booleanActions":  0,
-                                   "policyType":  45,
+                                   "policyType":  46,
                                    "enabled":  true
                                },
                                {
@@ -173,7 +173,7 @@
 
                                                                                                     ],
                                                                                         "booleanActions":  0,
-                                                                                        "policyType":  45,
+                                                                                        "policyType":  46,
                                                                                         "enabled":  true
                                                                                     },
                                                                                     {
@@ -192,7 +192,7 @@
                                                                                                                                          ],
                                                                                                                              "entityKey":  "safariPasswordAutoFillDomains",
                                                                                                                              "booleanActions":  0,
-                                                                                                                             "policyType":  45,
+                                                                                                                             "policyType":  46,
                                                                                                                              "enabled":  true
                                                                                                                          }
                                                                                                         }
@@ -208,7 +208,7 @@
                                                                                                     ],
                                                                                         "entityKey":  "safariPasswordAutoFillDomains",
                                                                                         "booleanActions":  0,
-                                                                                        "policyType":  45,
+                                                                                        "policyType":  46,
                                                                                         "enabled":  true
                                                                                     }
                                                                                 ],
@@ -222,7 +222,7 @@
 
                                                                          ],
                                                              "booleanActions":  0,
-                                                             "policyType":  45,
+                                                             "policyType":  46,
                                                              "enabled":  true
                                                          }
                                                      ],
@@ -230,7 +230,7 @@
 
                                                ],
                                    "booleanActions":  0,
-                                   "policyType":  45,
+                                   "policyType":  46,
                                    "enabled":  true
                                }
                            ]

Documentation/ObjectInfo/domains_macgeneral.json

@@ -13,7 +13,7 @@
 
                                                ],
                                    "booleanActions":  0,
-                                   "policyType":  60,
+                                   "policyType":  61,
                                    "enabled":  true
                                },
                                {
@@ -40,7 +40,7 @@
                                                                                                               ],
                                                                                                   "entityKey":  "emailInDomainSuffixes",
                                                                                                   "booleanActions":  0,
-                                                                                                  "policyType":  60,
+                                                                                                  "policyType":  61,
                                                                                                   "enabled":  true
                                                                                               }
                                                                              }
@@ -57,7 +57,7 @@
                                                                          ],
                                                              "entityKey":  "emailInDomainSuffixes",
                                                              "booleanActions":  0,
-                                                             "policyType":  60,
+                                                             "policyType":  61,
                                                              "enabled":  true
                                                          }
                                                      ],
@@ -65,7 +65,7 @@
 
                                                ],
                                    "booleanActions":  0,
-                                   "policyType":  60,
+                                   "policyType":  61,
                                    "enabled":  true
                                }
                            ]

Documentation/ObjectInfo/edgebrowsersmartscreen_windows10general.json

@@ -14,7 +14,7 @@
                                                         "entityKey":  "edgeRequireSmartScreen",
                                                         "booleanActions":  1,
                                                         "defaultValue":  false,
-                                                        "policyType":  78,
+                                                        "policyType":  79,
                                                         "enabled":  true
                                                     },
                                                     {
@@ -31,7 +31,7 @@
                                                         "entityKey":  "smartScreenBlockPromptOverride",
                                                         "booleanActions":  3,
                                                         "defaultValue":  false,
-                                                        "policyType":  78,
+                                                        "policyType":  79,
                                                         "enabled":  true
                                                     },
                                                     {
@@ -48,7 +48,7 @@
                                                         "entityKey":  "smartScreenBlockPromptOverrideForFiles",
                                                         "booleanActions":  3,
                                                         "defaultValue":  false,
-                                                        "policyType":  78,
+                                                        "policyType":  79,
                                                         "enabled":  true
                                                     }
                                                 ]

Documentation/ObjectInfo/edgekiosk_windows10kiosk.json

@@ -13,7 +13,7 @@
 
                                                      ],
                                          "booleanActions":  0,
-                                         "policyType":  79,
+                                         "policyType":  80,
                                          "enabled":  true
                                      },
                                      {
@@ -29,7 +29,7 @@
 
                                                      ],
                                          "booleanActions":  0,
-                                         "policyType":  79,
+                                         "policyType":  80,
                                          "enabled":  true
                                      },
                                      {
@@ -45,7 +45,7 @@
 
                                                      ],
                                          "booleanActions":  0,
-                                         "policyType":  79,
+                                         "policyType":  80,
                                          "enabled":  true
                                      },
                                      {
@@ -62,7 +62,7 @@
                                          "entityKey":  "edgeKioskEnablePublicBrowsing",
                                          "booleanActions":  0,
                                          "defaultValue":  false,
-                                         "policyType":  79,
+                                         "policyType":  80,
                                          "enabled":  true
                                      },
                                      {
@@ -78,7 +78,7 @@
 
                                                      ],
                                          "booleanActions":  0,
-                                         "policyType":  79,
+                                         "policyType":  80,
                                          "enabled":  true
                                      }
                                  ]

Documentation/ObjectInfo/editionupgrade_windowseditionupgrade.json

@@ -25,7 +25,7 @@
                                                                                                           ],
                                                                                               "entityKey":  "licenseType",
                                                                                               "booleanActions":  0,
-                                                                                              "policyType":  96,
+                                                                                              "policyType":  97,
                                                                                               "enabled":  true
                                                                                           },
                                                                                           {
@@ -42,7 +42,7 @@
                                                                                                           ],
                                                                                               "entityKey":  "productKey",
                                                                                               "booleanActions":  0,
-                                                                                              "policyType":  96,
+                                                                                              "policyType":  97,
                                                                                               "enabled":  true
                                                                                           }
                                                                                       ],
@@ -64,7 +64,7 @@
                                                                                                           ],
                                                                                               "entityKey":  "licenseType",
                                                                                               "booleanActions":  0,
-                                                                                              "policyType":  96,
+                                                                                              "policyType":  97,
                                                                                               "enabled":  true
                                                                                           },
                                                                                           {
@@ -81,7 +81,7 @@
                                                                                                           ],
                                                                                               "entityKey":  "productKey",
                                                                                               "booleanActions":  0,
-                                                                                              "policyType":  96,
+                                                                                              "policyType":  97,
                                                                                               "enabled":  true
                                                                                           }
                                                                                       ],
@@ -103,7 +103,7 @@
                                                                                                           ],
                                                                                               "entityKey":  "licenseType",
                                                                                               "booleanActions":  0,
-                                                                                              "policyType":  96,
+                                                                                              "policyType":  97,
                                                                                               "enabled":  true
                                                                                           },
                                                                                           {
@@ -120,7 +120,7 @@
                                                                                                           ],
                                                                                               "entityKey":  "productKey",
                                                                                               "booleanActions":  0,
-                                                                                              "policyType":  96,
+                                                                                              "policyType":  97,
                                                                                               "enabled":  true
                                                                                           }
                                                                                       ],
@@ -142,7 +142,7 @@
                                                                                                           ],
                                                                                               "entityKey":  "licenseType",
                                                                                               "booleanActions":  0,
-                                                                                              "policyType":  96,
+                                                                                              "policyType":  97,
                                                                                               "enabled":  true
                                                                                           },
                                                                                           {
@@ -159,7 +159,7 @@
                                                                                                           ],
                                                                                               "entityKey":  "productKey",
                                                                                               "booleanActions":  0,
-                                                                                              "policyType":  96,
+                                                                                              "policyType":  97,
                                                                                               "enabled":  true
                                                                                           }
                                                                                       ],
@@ -181,7 +181,7 @@
                                                                                                           ],
                                                                                               "entityKey":  "licenseType",
                                                                                               "booleanActions":  0,
-                                                                                              "policyType":  96,
+                                                                                              "policyType":  97,
                                                                                               "enabled":  true
                                                                                           },
                                                                                           {
@@ -198,7 +198,7 @@
                                                                                                           ],
                                                                                               "entityKey":  "productKey",
                                                                                               "booleanActions":  0,
-                                                                                              "policyType":  96,
+                                                                                              "policyType":  97,
                                                                                               "enabled":  true
                                                                                           }
                                                                                       ],
@@ -220,7 +220,7 @@
                                                                                                           ],
                                                                                               "entityKey":  "licenseType",
                                                                                               "booleanActions":  0,
-                                                                                              "policyType":  96,
+                                                                                              "policyType":  97,
                                                                                               "enabled":  true
                                                                                           },
                                                                                           {
@@ -237,7 +237,7 @@
                                                                                                           ],
                                                                                               "entityKey":  "productKey",
                                                                                               "booleanActions":  0,
-                                                                                              "policyType":  96,
+                                                                                              "policyType":  97,
                                                                                               "enabled":  true
                                                                                           }
                                                                                       ],
@@ -259,7 +259,7 @@
                                                                                                           ],
                                                                                               "entityKey":  "licenseType",
                                                                                               "booleanActions":  0,
-                                                                                              "policyType":  96,
+                                                                                              "policyType":  97,
                                                                                               "enabled":  true
                                                                                           },
                                                                                           {
@@ -276,7 +276,7 @@
                                                                                                           ],
                                                                                               "entityKey":  "productKey",
                                                                                               "booleanActions":  0,
-                                                                                              "policyType":  96,
+                                                                                              "policyType":  97,
                                                                                               "enabled":  true
                                                                                           }
                                                                                       ],
@@ -298,7 +298,7 @@
                                                                                                           ],
                                                                                               "entityKey":  "licenseType",
                                                                                               "booleanActions":  0,
-                                                                                              "policyType":  96,
+                                                                                              "policyType":  97,
                                                                                               "enabled":  true
                                                                                           },
                                                                                           {
@@ -315,7 +315,7 @@
                                                                                                           ],
                                                                                               "entityKey":  "productKey",
                                                                                               "booleanActions":  0,
-                                                                                              "policyType":  96,
+                                                                                              "policyType":  97,
                                                                                               "enabled":  true
                                                                                           }
                                                                                       ],
@@ -337,7 +337,7 @@
                                                                                                           ],
                                                                                               "entityKey":  "licenseType",
                                                                                               "booleanActions":  0,
-                                                                                              "policyType":  96,
+                                                                                              "policyType":  97,
                                                                                               "enabled":  true
                                                                                           },
                                                                                           {
@@ -354,7 +354,7 @@
                                                                                                           ],
                                                                                               "entityKey":  "license",
                                                                                               "booleanActions":  0,
-                                                                                              "policyType":  96,
+                                                                                              "policyType":  97,
                                                                                               "enabled":  true
                                                                                           }
                                                                                       ],
@@ -376,7 +376,7 @@
                                                                                                           ],
                                                                                               "entityKey":  "licenseType",
                                                                                               "booleanActions":  0,
-                                                                                              "policyType":  96,
+                                                                                              "policyType":  97,
                                                                                               "enabled":  true
                                                                                           },
                                                                                           {
@@ -393,7 +393,7 @@
                                                                                                           ],
                                                                                               "entityKey":  "license",
                                                                                               "booleanActions":  0,
-                                                                                              "policyType":  96,
+                                                                                              "policyType":  97,
                                                                                               "enabled":  true
                                                                                           }
                                                                                       ],
@@ -402,7 +402,7 @@
                                                                  ],
                                                      "entityKey":  "targetEdition",
                                                      "booleanActions":  0,
-                                                     "policyType":  96,
+                                                     "policyType":  97,
                                                      "enabled":  false
                                                  },
                                                  {
@@ -430,7 +430,7 @@
                                                                                                           ],
                                                                                               "entityKey":  "licenseType",
                                                                                               "booleanActions":  0,
-                                                                                              "policyType":  96,
+                                                                                              "policyType":  97,
                                                                                               "enabled":  true
                                                                                           },
                                                                                           {
@@ -447,7 +447,7 @@
                                                                                                           ],
                                                                                               "entityKey":  "productKey",
                                                                                               "booleanActions":  0,
-                                                                                              "policyType":  96,
+                                                                                              "policyType":  97,
                                                                                               "enabled":  true
                                                                                           }
                                                                                       ],
@@ -469,7 +469,7 @@
                                                                                                           ],
                                                                                               "entityKey":  "licenseType",
                                                                                               "booleanActions":  0,
-                                                                                              "policyType":  96,
+                                                                                              "policyType":  97,
                                                                                               "enabled":  true
                                                                                           },
                                                                                           {
@@ -486,7 +486,7 @@
                                                                                                           ],
                                                                                               "entityKey":  "productKey",
                                                                                               "booleanActions":  0,
-                                                                                              "policyType":  96,
+                                                                                              "policyType":  97,
                                                                                               "enabled":  true
                                                                                           }
                                                                                       ],
@@ -508,7 +508,7 @@
                                                                                                           ],
                                                                                               "entityKey":  "licenseType",
                                                                                               "booleanActions":  0,
-                                                                                              "policyType":  96,
+                                                                                              "policyType":  97,
                                                                                               "enabled":  true
                                                                                           },
                                                                                           {
@@ -525,7 +525,7 @@
                                                                                                           ],
                                                                                               "entityKey":  "productKey",
                                                                                               "booleanActions":  0,
-                                                                                              "policyType":  96,
+                                                                                              "policyType":  97,
                                                                                               "enabled":  true
                                                                                           }
                                                                                       ],
@@ -547,7 +547,7 @@
                                                                                                           ],
                                                                                               "entityKey":  "licenseType",
                                                                                               "booleanActions":  0,
-                                                                                              "policyType":  96,
+                                                                                              "policyType":  97,
                                                                                               "enabled":  true
                                                                                           },
                                                                                           {
@@ -564,7 +564,7 @@
                                                                                                           ],
                                                                                               "entityKey":  "productKey",
                                                                                               "booleanActions":  0,
-                                                                                              "policyType":  96,
+                                                                                              "policyType":  97,
                                                                                               "enabled":  true
                                                                                           }
                                                                                       ],
@@ -586,7 +586,7 @@
                                                                                                           ],
                                                                                               "entityKey":  "licenseType",
                                                                                               "booleanActions":  0,
-                                                                                              "policyType":  96,
+                                                                                              "policyType":  97,
                                                                                               "enabled":  true
                                                                                           },
                                                                                           {
@@ -603,7 +603,7 @@
                                                                                                           ],
                                                                                               "entityKey":  "productKey",
                                                                                               "booleanActions":  0,
-                                                                                              "policyType":  96,
+                                                                                              "policyType":  97,
                                                                                               "enabled":  true
                                                                                           }
                                                                                       ],
@@ -625,7 +625,7 @@
                                                                                                           ],
                                                                                               "entityKey":  "licenseType",
                                                                                               "booleanActions":  0,
-                                                                                              "policyType":  96,
+                                                                                              "policyType":  97,
                                                                                               "enabled":  true
                                                                                           },
                                                                                           {
@@ -642,7 +642,7 @@
                                                                                                           ],
                                                                                               "entityKey":  "productKey",
                                                                                               "booleanActions":  0,
-                                                                                              "policyType":  96,
+                                                                                              "policyType":  97,
                                                                                               "enabled":  true
                                                                                           }
                                                                                       ],
@@ -664,7 +664,7 @@
                                                                                                           ],
                                                                                               "entityKey":  "licenseType",
                                                                                               "booleanActions":  0,
-                                                                                              "policyType":  96,
+                                                                                              "policyType":  97,
                                                                                               "enabled":  true
                                                                                           },
                                                                                           {
@@ -681,7 +681,7 @@
                                                                                                           ],
                                                                                               "entityKey":  "productKey",
                                                                                               "booleanActions":  0,
-                                                                                              "policyType":  96,
+                                                                                              "policyType":  97,
                                                                                               "enabled":  true
                                                                                           }
                                                                                       ],
@@ -703,7 +703,7 @@
                                                                                                           ],
                                                                                               "entityKey":  "licenseType",
                                                                                               "booleanActions":  0,
-                                                                                              "policyType":  96,
+                                                                                              "policyType":  97,
                                                                                               "enabled":  true
                                                                                           },
                                                                                           {
@@ -720,7 +720,7 @@
                                                                                                           ],
                                                                                               "entityKey":  "productKey",
                                                                                               "booleanActions":  0,
-                                                                                              "policyType":  96,
+                                                                                              "policyType":  97,
                                                                                               "enabled":  true
                                                                                           }
                                                                                       ],
@@ -742,7 +742,7 @@
                                                                                                           ],
                                                                                               "entityKey":  "licenseType",
                                                                                               "booleanActions":  0,
-                                                                                              "policyType":  96,
+                                                                                              "policyType":  97,
                                                                                               "enabled":  true
                                                                                           },
                                                                                           {
@@ -759,7 +759,7 @@
                                                                                                           ],
                                                                                               "entityKey":  "productKey",
                                                                                               "booleanActions":  0,
-                                                                                              "policyType":  96,
+                                                                                              "policyType":  97,
                                                                                               "enabled":  true
                                                                                           }
                                                                                       ],
@@ -781,7 +781,7 @@
                                                                                                           ],
                                                                                               "entityKey":  "licenseType",
                                                                                               "booleanActions":  0,
-                                                                                              "policyType":  96,
+                                                                                              "policyType":  97,
                                                                                               "enabled":  true
                                                                                           },
                                                                                           {
@@ -798,7 +798,7 @@
                                                                                                           ],
                                                                                               "entityKey":  "productKey",
                                                                                               "booleanActions":  0,
-                                                                                              "policyType":  96,
+                                                                                              "policyType":  97,
                                                                                               "enabled":  true
                                                                                           }
                                                                                       ],
@@ -820,7 +820,7 @@
                                                                                                           ],
                                                                                               "entityKey":  "licenseType",
                                                                                               "booleanActions":  0,
-                                                                                              "policyType":  96,
+                                                                                              "policyType":  97,
                                                                                               "enabled":  true
                                                                                           },
                                                                                           {
@@ -837,7 +837,7 @@
                                                                                                           ],
                                                                                               "entityKey":  "license",
                                                                                               "booleanActions":  0,
-                                                                                              "policyType":  96,
+                                                                                              "policyType":  97,
                                                                                               "enabled":  true
                                                                                           }
                                                                                       ],
@@ -859,7 +859,7 @@
                                                                                                           ],
                                                                                               "entityKey":  "licenseType",
                                                                                               "booleanActions":  0,
-                                                                                              "policyType":  96,
+                                                                                              "policyType":  97,
                                                                                               "enabled":  true
                                                                                           },
                                                                                           {
@@ -876,7 +876,7 @@
                                                                                                           ],
                                                                                               "entityKey":  "license",
                                                                                               "booleanActions":  0,
-                                                                                              "policyType":  96,
+                                                                                              "policyType":  97,
                                                                                               "enabled":  true
                                                                                           }
                                                                                       ],
@@ -885,7 +885,7 @@
                                                                  ],
                                                      "entityKey":  "targetEdition",
                                                      "booleanActions":  0,
-                                                     "policyType":  96,
+                                                     "policyType":  97,
                                                      "enabled":  false
                                                  },
                                                  {
@@ -915,7 +915,7 @@
                                                                                               "booleanActions":  0,
                                                                                               "defaultValue":  "notConfigured",
                                                                                               "unconfiguredValue":  "notConfigured",
-                                                                                              "policyType":  96,
+                                                                                              "policyType":  97,
                                                                                               "enabled":  true
                                                                                           },
                                                                                           {
@@ -929,7 +929,7 @@
                                                                                                           ],
                                                                                               "entityKey":  "license",
                                                                                               "booleanActions":  0,
-                                                                                              "policyType":  96,
+                                                                                              "policyType":  97,
                                                                                               "enabled":  true
                                                                                           },
                                                                                           {
@@ -943,7 +943,7 @@
                                                                                                           ],
                                                                                               "entityKey":  "productKey",
                                                                                               "booleanActions":  0,
-                                                                                              "policyType":  96,
+                                                                                              "policyType":  97,
                                                                                               "enabled":  true
                                                                                           }
                                                                                       ],
@@ -965,7 +965,7 @@
                                                                                                           ],
                                                                                               "entityKey":  "licenseType",
                                                                                               "booleanActions":  0,
-                                                                                              "policyType":  96,
+                                                                                              "policyType":  97,
                                                                                               "enabled":  true
                                                                                           },
                                                                                           {
@@ -982,7 +982,7 @@
                                                                                                           ],
                                                                                               "entityKey":  "productKey",
                                                                                               "booleanActions":  0,
-                                                                                              "policyType":  96,
+                                                                                              "policyType":  97,
                                                                                               "enabled":  true
                                                                                           }
                                                                                       ],
@@ -1004,7 +1004,7 @@
                                                                                                           ],
                                                                                               "entityKey":  "licenseType",
                                                                                               "booleanActions":  0,
-                                                                                              "policyType":  96,
+                                                                                              "policyType":  97,
                                                                                               "enabled":  true
                                                                                           },
                                                                                           {
@@ -1021,7 +1021,7 @@
                                                                                                           ],
                                                                                               "entityKey":  "productKey",
                                                                                               "booleanActions":  0,
-                                                                                              "policyType":  96,
+                                                                                              "policyType":  97,
                                                                                               "enabled":  true
                                                                                           }
                                                                                       ],
@@ -1043,7 +1043,7 @@
                                                                                                           ],
                                                                                               "entityKey":  "licenseType",
                                                                                               "booleanActions":  0,
-                                                                                              "policyType":  96,
+                                                                                              "policyType":  97,
                                                                                               "enabled":  true
                                                                                           },
                                                                                           {
@@ -1060,7 +1060,7 @@
                                                                                                           ],
                                                                                               "entityKey":  "productKey",
                                                                                               "booleanActions":  0,
-                                                                                              "policyType":  96,
+                                                                                              "policyType":  97,
                                                                                               "enabled":  true
                                                                                           }
                                                                                       ],
@@ -1082,7 +1082,7 @@
                                                                                                           ],
                                                                                               "entityKey":  "licenseType",
                                                                                               "booleanActions":  0,
-                                                                                              "policyType":  96,
+                                                                                              "policyType":  97,
                                                                                               "enabled":  true
                                                                                           },
                                                                                           {
@@ -1099,7 +1099,7 @@
                                                                                                           ],
                                                                                               "entityKey":  "productKey",
                                                                                               "booleanActions":  0,
-                                                                                              "policyType":  96,
+                                                                                              "policyType":  97,
                                                                                               "enabled":  true
                                                                                           }
                                                                                       ],
@@ -1121,7 +1121,7 @@
                                                                                                           ],
                                                                                               "entityKey":  "licenseType",
                                                                                               "booleanActions":  0,
-                                                                                              "policyType":  96,
+                                                                                              "policyType":  97,
                                                                                               "enabled":  true
                                                                                           },
                                                                                           {
@@ -1138,7 +1138,7 @@
                                                                                                           ],
                                                                                               "entityKey":  "productKey",
                                                                                               "booleanActions":  0,
-                                                                                              "policyType":  96,
+                                                                                              "policyType":  97,
                                                                                               "enabled":  true
                                                                                           }
                                                                                       ],
@@ -1160,7 +1160,7 @@
                                                                                                           ],
                                                                                               "entityKey":  "licenseType",
                                                                                               "booleanActions":  0,
-                                                                                              "policyType":  96,
+                                                                                              "policyType":  97,
                                                                                               "enabled":  true
                                                                                           },
                                                                                           {
@@ -1177,7 +1177,7 @@
                                                                                                           ],
                                                                                               "entityKey":  "productKey",
                                                                                               "booleanActions":  0,
-                                                                                              "policyType":  96,
+                                                                                              "policyType":  97,
                                                                                               "enabled":  true
                                                                                           }
                                                                                       ],
@@ -1199,7 +1199,7 @@
                                                                                                           ],
                                                                                               "entityKey":  "licenseType",
                                                                                               "booleanActions":  0,
-                                                                                              "policyType":  96,
+                                                                                              "policyType":  97,
                                                                                               "enabled":  true
                                                                                           },
                                                                                           {
@@ -1216,7 +1216,7 @@
                                                                                                           ],
                                                                                               "entityKey":  "productKey",
                                                                                               "booleanActions":  0,
-                                                                                              "policyType":  96,
+                                                                                              "policyType":  97,
                                                                                               "enabled":  true
                                                                                           }
                                                                                       ],
@@ -1238,7 +1238,7 @@
                                                                                                           ],
                                                                                               "entityKey":  "licenseType",
                                                                                               "booleanActions":  0,
-                                                                                              "policyType":  96,
+                                                                                              "policyType":  97,
                                                                                               "enabled":  true
                                                                                           },
                                                                                           {
@@ -1255,7 +1255,7 @@
                                                                                                           ],
                                                                                               "entityKey":  "productKey",
                                                                                               "booleanActions":  0,
-                                                                                              "policyType":  96,
+                                                                                              "policyType":  97,
                                                                                               "enabled":  true
                                                                                           }
                                                                                       ],
@@ -1277,7 +1277,7 @@
                                                                                                           ],
                                                                                               "entityKey":  "licenseType",
                                                                                               "booleanActions":  0,
-                                                                                              "policyType":  96,
+                                                                                              "policyType":  97,
                                                                                               "enabled":  true
                                                                                           },
                                                                                           {
@@ -1294,7 +1294,7 @@
                                                                                                           ],
                                                                                               "entityKey":  "productKey",
                                                                                               "booleanActions":  0,
-                                                                                              "policyType":  96,
+                                                                                              "policyType":  97,
                                                                                               "enabled":  true
                                                                                           }
                                                                                       ],
@@ -1316,7 +1316,7 @@
                                                                                                           ],
                                                                                               "entityKey":  "licenseType",
                                                                                               "booleanActions":  0,
-                                                                                              "policyType":  96,
+                                                                                              "policyType":  97,
                                                                                               "enabled":  true
                                                                                           },
                                                                                           {
@@ -1333,7 +1333,7 @@
                                                                                                           ],
                                                                                               "entityKey":  "productKey",
                                                                                               "booleanActions":  0,
-                                                                                              "policyType":  96,
+                                                                                              "policyType":  97,
                                                                                               "enabled":  true
                                                                                           }
                                                                                       ],
@@ -1355,7 +1355,7 @@
                                                                                                           ],
                                                                                               "entityKey":  "licenseType",
                                                                                               "booleanActions":  0,
-                                                                                              "policyType":  96,
+                                                                                              "policyType":  97,
                                                                                               "enabled":  true
                                                                                           },
                                                                                           {
@@ -1372,7 +1372,7 @@
                                                                                                           ],
                                                                                               "entityKey":  "license",
                                                                                               "booleanActions":  0,
-                                                                                              "policyType":  96,
+                                                                                              "policyType":  97,
                                                                                               "enabled":  true
                                                                                           }
                                                                                       ],
@@ -1394,7 +1394,7 @@
                                                                                                           ],
                                                                                               "entityKey":  "licenseType",
                                                                                               "booleanActions":  0,
-                                                                                              "policyType":  96,
+                                                                                              "policyType":  97,
                                                                                               "enabled":  true
                                                                                           },
                                                                                           {
@@ -1411,7 +1411,7 @@
                                                                                                           ],
                                                                                               "entityKey":  "license",
                                                                                               "booleanActions":  0,
-                                                                                              "policyType":  96,
+                                                                                              "policyType":  97,
                                                                                               "enabled":  true
                                                                                           }
                                                                                       ],
@@ -1422,7 +1422,7 @@
                                                      "booleanActions":  0,
                                                      "defaultValue":  "notConfigured",
                                                      "unconfiguredValue":  "notConfigured",
-                                                     "policyType":  96,
+                                                     "policyType":  97,
                                                      "enabled":  true
                                                  },
                                                  {
@@ -1437,7 +1437,7 @@
                                                                  ],
                                                      "entityKey":  "WindowsSModeStatus",
                                                      "booleanActions":  0,
-                                                     "policyType":  96,
+                                                     "policyType":  97,
                                                      "enabled":  true
                                                  },
                                                  {
@@ -1452,7 +1452,7 @@
                                                                  ],
                                                      "entityKey":  "SwitchingPolicy",
                                                      "booleanActions":  0,
-                                                     "policyType":  96,
+                                                     "policyType":  97,
                                                      "enabled":  true
                                                  },
                                                  {
@@ -1467,7 +1467,7 @@
                                                                  ],
                                                      "entityKey":  "EditionUpgradeReportStatus",
                                                      "booleanActions":  0,
-                                                     "policyType":  96,
+                                                     "policyType":  97,
                                                      "enabled":  true
                                                  }
                                              ]

Documentation/ObjectInfo/educationstudentcerts_ioseducation.json

@@ -13,7 +13,7 @@
 
                                                                ],
                                                    "booleanActions":  0,
-                                                   "policyType":  43,
+                                                   "policyType":  44,
                                                    "enabled":  true
                                                },
                                                {
@@ -48,7 +48,7 @@
 
                                                                                                                                    ],
                                                                                                                        "booleanActions":  0,
-                                                                                                                       "policyType":  43,
+                                                                                                                       "policyType":  44,
                                                                                                                        "enabled":  true
                                                                                                                    },
                                                                                                                    {
@@ -66,7 +66,7 @@
                                                                                                                                    ],
                                                                                                                        "entityKey":  "trustedRootCertificate",
                                                                                                                        "booleanActions":  0,
-                                                                                                                       "policyType":  43,
+                                                                                                                       "policyType":  44,
                                                                                                                        "enabled":  true
                                                                                                                    },
                                                                                                                    {
@@ -82,7 +82,7 @@
 
                                                                                                                                    ],
                                                                                                                        "booleanActions":  0,
-                                                                                                                       "policyType":  43,
+                                                                                                                       "policyType":  44,
                                                                                                                        "enabled":  true
                                                                                                                    },
                                                                                                                    {
@@ -99,7 +99,7 @@
                                                                                                                        "entityKey":  "subjectNameFormat",
                                                                                                                        "booleanActions":  0,
                                                                                                                        "defaultValue":  "member-{UserEmail}",
-                                                                                                                       "policyType":  43,
+                                                                                                                       "policyType":  44,
                                                                                                                        "enabled":  true
                                                                                                                    },
                                                                                                                    {
@@ -116,7 +116,7 @@
                                                                                                                        "entityKey":  "certificationAuthority",
                                                                                                                        "booleanActions":  0,
                                                                                                                        "defaultValue":  "",
-                                                                                                                       "policyType":  43,
+                                                                                                                       "policyType":  44,
                                                                                                                        "enabled":  true
                                                                                                                    },
                                                                                                                    {
@@ -133,7 +133,7 @@
                                                                                                                        "entityKey":  "certificationAuthorityName",
                                                                                                                        "booleanActions":  0,
                                                                                                                        "defaultValue":  "",
-                                                                                                                       "policyType":  43,
+                                                                                                                       "policyType":  44,
                                                                                                                        "enabled":  true
                                                                                                                    },
                                                                                                                    {
@@ -150,7 +150,7 @@
                                                                                                                        "entityKey":  "certificateTemplateName",
                                                                                                                        "booleanActions":  0,
                                                                                                                        "defaultValue":  "",
-                                                                                                                       "policyType":  43,
+                                                                                                                       "policyType":  44,
                                                                                                                        "enabled":  true
                                                                                                                    },
                                                                                                                    {
@@ -166,7 +166,7 @@
                                                                                                                                    ],
                                                                                                                        "entityKey":  "renewalThresholdPercentage",
                                                                                                                        "booleanActions":  0,
-                                                                                                                       "policyType":  43,
+                                                                                                                       "policyType":  44,
                                                                                                                        "enabled":  true
                                                                                                                    },
                                                                                                                    {
@@ -201,7 +201,7 @@
                                                                                                                                    ],
                                                                                                                        "entityKey":  "certificateValidityPeriodValue",
                                                                                                                        "booleanActions":  0,
-                                                                                                                       "policyType":  43,
+                                                                                                                       "policyType":  44,
                                                                                                                        "enabled":  true
                                                                                                                    }
                                                                                                                ],
@@ -217,7 +217,7 @@
                                                                                                         ],
                                                                                             "entityKey":  "studentCertificateSettings",
                                                                                             "booleanActions":  0,
-                                                                                            "policyType":  43,
+                                                                                            "policyType":  44,
                                                                                             "enabled":  true
                                                                                         }
                                                                                     ],
@@ -242,7 +242,7 @@
 
                                                                                                                                    ],
                                                                                                                        "booleanActions":  0,
-                                                                                                                       "policyType":  43,
+                                                                                                                       "policyType":  44,
                                                                                                                        "enabled":  true
                                                                                                                    },
                                                                                                                    {
@@ -260,7 +260,7 @@
                                                                                                                                    ],
                                                                                                                        "entityKey":  "trustedRootCertificate",
                                                                                                                        "booleanActions":  0,
-                                                                                                                       "policyType":  43,
+                                                                                                                       "policyType":  44,
                                                                                                                        "enabled":  true
                                                                                                                    },
                                                                                                                    {
@@ -274,7 +274,7 @@
 
                                                                                                                                    ],
                                                                                                                        "booleanActions":  0,
-                                                                                                                       "policyType":  43,
+                                                                                                                       "policyType":  44,
                                                                                                                        "enabled":  true
                                                                                                                    },
                                                                                                                    {
@@ -291,7 +291,7 @@
                                                                                                                        "entityKey":  "subjectNameFormat",
                                                                                                                        "booleanActions":  0,
                                                                                                                        "defaultValue":  "member-{UserEmail}",
-                                                                                                                       "policyType":  43,
+                                                                                                                       "policyType":  44,
                                                                                                                        "enabled":  true
                                                                                                                    },
                                                                                                                    {
@@ -308,7 +308,7 @@
                                                                                                                        "entityKey":  "certificationAuthority",
                                                                                                                        "booleanActions":  0,
                                                                                                                        "defaultValue":  "",
-                                                                                                                       "policyType":  43,
+                                                                                                                       "policyType":  44,
                                                                                                                        "enabled":  true
                                                                                                                    },
                                                                                                                    {
@@ -325,7 +325,7 @@
                                                                                                                        "entityKey":  "certificationAuthorityName",
                                                                                                                        "booleanActions":  0,
                                                                                                                        "defaultValue":  "",
-                                                                                                                       "policyType":  43,
+                                                                                                                       "policyType":  44,
                                                                                                                        "enabled":  true
                                                                                                                    },
                                                                                                                    {
@@ -342,7 +342,7 @@
                                                                                                                        "entityKey":  "certificateTemplateName",
                                                                                                                        "booleanActions":  0,
                                                                                                                        "defaultValue":  "",
-                                                                                                                       "policyType":  43,
+                                                                                                                       "policyType":  44,
                                                                                                                        "enabled":  true
                                                                                                                    },
                                                                                                                    {
@@ -358,7 +358,7 @@
                                                                                                                                    ],
                                                                                                                        "entityKey":  "renewalThresholdPercentage",
                                                                                                                        "booleanActions":  0,
-                                                                                                                       "policyType":  43,
+                                                                                                                       "policyType":  44,
                                                                                                                        "enabled":  true
                                                                                                                    },
                                                                                                                    {
@@ -393,7 +393,7 @@
                                                                                                                                    ],
                                                                                                                        "entityKey":  "certificateValidityPeriodValue",
                                                                                                                        "booleanActions":  0,
-                                                                                                                       "policyType":  43,
+                                                                                                                       "policyType":  44,
                                                                                                                        "enabled":  true
                                                                                                                    }
                                                                                                                ],
@@ -409,7 +409,7 @@
                                                                                                         ],
                                                                                             "entityKey":  "deviceCertificateSettings",
                                                                                             "booleanActions":  0,
-                                                                                            "policyType":  43,
+                                                                                            "policyType":  44,
                                                                                             "enabled":  true
                                                                                         }
                                                                                     ],
@@ -418,7 +418,7 @@
                                                                ],
                                                    "entityKey":  "StudentDeviceCertOptionPicker",
                                                    "booleanActions":  0,
-                                                   "policyType":  43,
+                                                   "policyType":  44,
                                                    "enabled":  true
                                                }
                                            ]

Documentation/ObjectInfo/educationtakeatest_windows10secureassessmentprofile.json

@@ -14,7 +14,7 @@
 
                                                                                 ],
                                                                     "booleanActions":  0,
-                                                                    "policyType":  84,
+                                                                    "policyType":  85,
                                                                     "enabled":  true
                                                                 },
                                                                 {
@@ -28,7 +28,7 @@
 
                                                                                 ],
                                                                     "booleanActions":  0,
-                                                                    "policyType":  84,
+                                                                    "policyType":  85,
                                                                     "enabled":  true
                                                                 },
                                                                 {
@@ -62,7 +62,7 @@
                                                                                                                          ],
                                                                                                              "entityKey":  "configurationAccount",
                                                                                                              "booleanActions":  0,
-                                                                                                             "policyType":  84,
+                                                                                                             "policyType":  85,
                                                                                                              "enabled":  true
                                                                                                          }
                                                                                                      ],
@@ -86,7 +86,7 @@
                                                                                                                          ],
                                                                                                              "entityKey":  "configurationAccount",
                                                                                                              "booleanActions":  0,
-                                                                                                             "policyType":  84,
+                                                                                                             "policyType":  85,
                                                                                                              "enabled":  true
                                                                                                          }
                                                                                                      ],
@@ -110,7 +110,7 @@
                                                                                                                          ],
                                                                                                              "entityKey":  "configurationAccount",
                                                                                                              "booleanActions":  0,
-                                                                                                             "policyType":  84,
+                                                                                                             "policyType":  85,
                                                                                                              "enabled":  true
                                                                                                          }
                                                                                                      ],
@@ -134,7 +134,7 @@
                                                                                                                          ],
                                                                                                              "entityKey":  "localGuestAccountName",
                                                                                                              "booleanActions":  0,
-                                                                                                             "policyType":  84,
+                                                                                                             "policyType":  85,
                                                                                                              "enabled":  true
                                                                                                          }
                                                                                                      ],
@@ -143,7 +143,7 @@
                                                                                 ],
                                                                     "entityKey":  "configurationAccountType",
                                                                     "booleanActions":  0,
-                                                                    "policyType":  84,
+                                                                    "policyType":  85,
                                                                     "enabled":  true
                                                                 },
                                                                 {
@@ -160,7 +160,7 @@
                                                                                 ],
                                                                     "entityKey":  "launchUri",
                                                                     "booleanActions":  0,
-                                                                    "policyType":  84,
+                                                                    "policyType":  85,
                                                                     "enabled":  true
                                                                 },
                                                                 {
@@ -177,7 +177,7 @@
                                                                     "entityKey":  "allowPrinting",
                                                                     "booleanActions":  1,
                                                                     "defaultValue":  false,
-                                                                    "policyType":  84,
+                                                                    "policyType":  85,
                                                                     "enabled":  true
                                                                 },
                                                                 {
@@ -194,7 +194,7 @@
                                                                     "entityKey":  "allowScreenCapture",
                                                                     "booleanActions":  0,
                                                                     "defaultValue":  false,
-                                                                    "policyType":  84,
+                                                                    "policyType":  85,
                                                                     "enabled":  true
                                                                 },
                                                                 {
@@ -211,7 +211,7 @@
                                                                     "entityKey":  "allowTextSuggestion",
                                                                     "booleanActions":  0,
                                                                     "defaultValue":  false,
-                                                                    "policyType":  84,
+                                                                    "policyType":  85,
                                                                     "enabled":  true
                                                                 }
                                                             ]

Documentation/ObjectInfo/educationteachercerts_ioseducation.json

@@ -13,7 +13,7 @@
 
                                                                ],
                                                    "booleanActions":  0,
-                                                   "policyType":  43,
+                                                   "policyType":  44,
                                                    "enabled":  true
                                                },
                                                {
@@ -31,7 +31,7 @@
 
                                                                                           ],
                                                                               "booleanActions":  0,
-                                                                              "policyType":  43,
+                                                                              "policyType":  44,
                                                                               "enabled":  true
                                                                           },
                                                                           {
@@ -49,7 +49,7 @@
                                                                                           ],
                                                                               "entityKey":  "trustedRootCertificate",
                                                                               "booleanActions":  0,
-                                                                              "policyType":  43,
+                                                                              "policyType":  44,
                                                                               "enabled":  true
                                                                           },
                                                                           {
@@ -65,7 +65,7 @@
 
                                                                                           ],
                                                                               "booleanActions":  0,
-                                                                              "policyType":  43,
+                                                                              "policyType":  44,
                                                                               "enabled":  true
                                                                           },
                                                                           {
@@ -82,7 +82,7 @@
                                                                               "entityKey":  "subjectNameFormat",
                                                                               "booleanActions":  0,
                                                                               "defaultValue":  "leader-{UserEmail}",
-                                                                              "policyType":  43,
+                                                                              "policyType":  44,
                                                                               "enabled":  true
                                                                           },
                                                                           {
@@ -99,7 +99,7 @@
                                                                               "entityKey":  "certificationAuthority",
                                                                               "booleanActions":  0,
                                                                               "defaultValue":  "",
-                                                                              "policyType":  43,
+                                                                              "policyType":  44,
                                                                               "enabled":  true
                                                                           },
                                                                           {
@@ -116,7 +116,7 @@
                                                                               "entityKey":  "certificationAuthorityName",
                                                                               "booleanActions":  0,
                                                                               "defaultValue":  "",
-                                                                              "policyType":  43,
+                                                                              "policyType":  44,
                                                                               "enabled":  true
                                                                           },
                                                                           {
@@ -133,7 +133,7 @@
                                                                               "entityKey":  "certificateTemplateName",
                                                                               "booleanActions":  0,
                                                                               "defaultValue":  "",
-                                                                              "policyType":  43,
+                                                                              "policyType":  44,
                                                                               "enabled":  true
                                                                           },
                                                                           {
@@ -149,7 +149,7 @@
                                                                                           ],
                                                                               "entityKey":  "renewalThresholdPercentage",
                                                                               "booleanActions":  0,
-                                                                              "policyType":  43,
+                                                                              "policyType":  44,
                                                                               "enabled":  true
                                                                           },
                                                                           {
@@ -184,7 +184,7 @@
                                                                                           ],
                                                                               "entityKey":  "certificateValidityPeriodValue",
                                                                               "booleanActions":  0,
-                                                                              "policyType":  43,
+                                                                              "policyType":  44,
                                                                               "enabled":  true
                                                                           }
                                                                       ],
@@ -200,7 +200,7 @@
                                                                ],
                                                    "entityKey":  "teacherCertificateSettings",
                                                    "booleanActions":  0,
-                                                   "policyType":  43,
+                                                   "policyType":  44,
                                                    "enabled":  true
                                                }
                                            ]

Documentation/ObjectInfo/emailprofile_windows10emailprofile.json

@@ -14,7 +14,7 @@
                                                                ],
                                                    "entityKey":  "hostName",
                                                    "booleanActions":  0,
-                                                   "policyType":  75,
+                                                   "policyType":  76,
                                                    "enabled":  true
                                                },
                                                {
@@ -31,7 +31,7 @@
                                                                ],
                                                    "entityKey":  "accountName",
                                                    "booleanActions":  0,
-                                                   "policyType":  75,
+                                                   "policyType":  76,
                                                    "enabled":  true
                                                },
                                                {
@@ -60,7 +60,7 @@
                                                                ],
                                                    "entityKey":  "usernameSource",
                                                    "booleanActions":  0,
-                                                   "policyType":  75,
+                                                   "policyType":  76,
                                                    "enabled":  false
                                                },
                                                {
@@ -129,7 +129,7 @@
                                                                                                                                                  ],
                                                                                                                                      "entityKey":  "userDomainNameSource",
                                                                                                                                      "booleanActions":  0,
-                                                                                                                                     "policyType":  75,
+                                                                                                                                     "policyType":  76,
                                                                                                                                      "enabled":  true
                                                                                                                                  }
                                                                                                                              ],
@@ -153,7 +153,7 @@
                                                                                                                                                  ],
                                                                                                                                      "entityKey":  "customDomainName",
                                                                                                                                      "booleanActions":  0,
-                                                                                                                                     "policyType":  75,
+                                                                                                                                     "policyType":  76,
                                                                                                                                      "enabled":  true
                                                                                                                                  }
                                                                                                                              ],
@@ -162,7 +162,7 @@
                                                                                                         ],
                                                                                             "entityKey":  "domainNameSourceType",
                                                                                             "booleanActions":  0,
-                                                                                            "policyType":  75,
+                                                                                            "policyType":  76,
                                                                                             "enabled":  true
                                                                                         }
                                                                                     ],
@@ -171,7 +171,7 @@
                                                                ],
                                                    "entityKey":  "usernameAADSource",
                                                    "booleanActions":  0,
-                                                   "policyType":  75,
+                                                   "policyType":  76,
                                                    "enabled":  true
                                                },
                                                {
@@ -186,7 +186,7 @@
                                                                ],
                                                    "entityKey":  "usernameSource",
                                                    "booleanActions":  0,
-                                                   "policyType":  75,
+                                                   "policyType":  76,
                                                    "enabled":  true
                                                },
                                                {
@@ -215,7 +215,7 @@
                                                                ],
                                                    "entityKey":  "emailAddressSource",
                                                    "booleanActions":  0,
-                                                   "policyType":  75,
+                                                   "policyType":  76,
                                                    "enabled":  true
                                                },
                                                {
@@ -231,7 +231,7 @@
 
                                                                ],
                                                    "booleanActions":  0,
-                                                   "policyType":  75,
+                                                   "policyType":  76,
                                                    "enabled":  true
                                                },
                                                {
@@ -257,7 +257,7 @@
                                                    "entityKey":  "requireSsl",
                                                    "booleanActions":  0,
                                                    "defaultValue":  true,
-                                                   "policyType":  75,
+                                                   "policyType":  76,
                                                    "enabled":  true
                                                },
                                                {
@@ -274,7 +274,7 @@
 
                                                                ],
                                                    "booleanActions":  0,
-                                                   "policyType":  75,
+                                                   "policyType":  76,
                                                    "enabled":  true
                                                },
                                                {
@@ -326,7 +326,7 @@
                                                    "booleanActions":  0,
                                                    "defaultValue":  "userDefined",
                                                    "unconfiguredValue":  "userDefined",
-                                                   "policyType":  75,
+                                                   "policyType":  76,
                                                    "enabled":  true
                                                },
                                                {
@@ -377,7 +377,7 @@
                                                    "entityKey":  "emailSyncSchedule",
                                                    "booleanActions":  0,
                                                    "defaultValue":  "manual",
-                                                   "policyType":  75,
+                                                   "policyType":  76,
                                                    "enabled":  true
                                                },
                                                {
@@ -394,7 +394,7 @@
 
                                                                ],
                                                    "booleanActions":  0,
-                                                   "policyType":  75,
+                                                   "policyType":  76,
                                                    "enabled":  true
                                                },
                                                {
@@ -418,7 +418,7 @@
                                                                ],
                                                    "entityKey":  "syncContacts",
                                                    "booleanActions":  0,
-                                                   "policyType":  75,
+                                                   "policyType":  76,
                                                    "enabled":  true
                                                },
                                                {
@@ -442,7 +442,7 @@
                                                                ],
                                                    "entityKey":  "syncCalendar",
                                                    "booleanActions":  0,
-                                                   "policyType":  75,
+                                                   "policyType":  76,
                                                    "enabled":  true
                                                },
                                                {
@@ -466,7 +466,7 @@
                                                                ],
                                                    "entityKey":  "syncTasks",
                                                    "booleanActions":  0,
-                                                   "policyType":  75,
+                                                   "policyType":  76,
                                                    "enabled":  true
                                                }
                                            ]

Documentation/ObjectInfo/emailprofile_windowsphoneemailprofile.json

@@ -14,7 +14,7 @@
                                                                   ],
                                                       "entityKey":  "hostName",
                                                       "booleanActions":  0,
-                                                      "policyType":  99,
+                                                      "policyType":  100,
                                                       "enabled":  true
                                                   },
                                                   {
@@ -31,7 +31,7 @@
                                                                   ],
                                                       "entityKey":  "accountName",
                                                       "booleanActions":  0,
-                                                      "policyType":  99,
+                                                      "policyType":  100,
                                                       "enabled":  true
                                                   },
                                                   {
@@ -60,7 +60,7 @@
                                                                   ],
                                                       "entityKey":  "usernameSource",
                                                       "booleanActions":  0,
-                                                      "policyType":  99,
+                                                      "policyType":  100,
                                                       "enabled":  false
                                                   },
                                                   {
@@ -129,7 +129,7 @@
                                                                                                                                                     ],
                                                                                                                                         "entityKey":  "userDomainNameSource",
                                                                                                                                         "booleanActions":  0,
-                                                                                                                                        "policyType":  99,
+                                                                                                                                        "policyType":  100,
                                                                                                                                         "enabled":  true
                                                                                                                                     }
                                                                                                                                 ],
@@ -153,7 +153,7 @@
                                                                                                                                                     ],
                                                                                                                                         "entityKey":  "customDomainName",
                                                                                                                                         "booleanActions":  0,
-                                                                                                                                        "policyType":  99,
+                                                                                                                                        "policyType":  100,
                                                                                                                                         "enabled":  true
                                                                                                                                     }
                                                                                                                                 ],
@@ -162,7 +162,7 @@
                                                                                                            ],
                                                                                                "entityKey":  "domainNameSourceType",
                                                                                                "booleanActions":  0,
-                                                                                               "policyType":  99,
+                                                                                               "policyType":  100,
                                                                                                "enabled":  true
                                                                                            }
                                                                                        ],
@@ -171,7 +171,7 @@
                                                                   ],
                                                       "entityKey":  "usernameAADSource",
                                                       "booleanActions":  0,
-                                                      "policyType":  99,
+                                                      "policyType":  100,
                                                       "enabled":  true
                                                   },
                                                   {
@@ -186,7 +186,7 @@
                                                                   ],
                                                       "entityKey":  "usernameSource",
                                                       "booleanActions":  0,
-                                                      "policyType":  99,
+                                                      "policyType":  100,
                                                       "enabled":  true
                                                   },
                                                   {
@@ -215,7 +215,7 @@
                                                                   ],
                                                       "entityKey":  "emailAddressSource",
                                                       "booleanActions":  0,
-                                                      "policyType":  99,
+                                                      "policyType":  100,
                                                       "enabled":  true
                                                   },
                                                   {
@@ -231,7 +231,7 @@
 
                                                                   ],
                                                       "booleanActions":  0,
-                                                      "policyType":  99,
+                                                      "policyType":  100,
                                                       "enabled":  true
                                                   },
                                                   {
@@ -257,7 +257,7 @@
                                                       "entityKey":  "requireSsl",
                                                       "booleanActions":  0,
                                                       "defaultValue":  true,
-                                                      "policyType":  99,
+                                                      "policyType":  100,
                                                       "enabled":  true
                                                   },
                                                   {
@@ -274,7 +274,7 @@
 
                                                                   ],
                                                       "booleanActions":  0,
-                                                      "policyType":  99,
+                                                      "policyType":  100,
                                                       "enabled":  true
                                                   },
                                                   {
@@ -326,7 +326,7 @@
                                                       "booleanActions":  0,
                                                       "defaultValue":  "userDefined",
                                                       "unconfiguredValue":  "userDefined",
-                                                      "policyType":  99,
+                                                      "policyType":  100,
                                                       "enabled":  true
                                                   },
                                                   {
@@ -377,7 +377,7 @@
                                                       "entityKey":  "emailSyncSchedule",
                                                       "booleanActions":  0,
                                                       "defaultValue":  "manual",
-                                                      "policyType":  99,
+                                                      "policyType":  100,
                                                       "enabled":  true
                                                   },
                                                   {
@@ -394,7 +394,7 @@
 
                                                                   ],
                                                       "booleanActions":  0,
-                                                      "policyType":  99,
+                                                      "policyType":  100,
                                                       "enabled":  true
                                                   },
                                                   {
@@ -418,7 +418,7 @@
                                                                   ],
                                                       "entityKey":  "syncContacts",
                                                       "booleanActions":  0,
-                                                      "policyType":  99,
+                                                      "policyType":  100,
                                                       "enabled":  true
                                                   },
                                                   {
@@ -442,7 +442,7 @@
                                                                   ],
                                                       "entityKey":  "syncCalendar",
                                                       "booleanActions":  0,
-                                                      "policyType":  99,
+                                                      "policyType":  100,
                                                       "enabled":  true
                                                   },
                                                   {
@@ -466,7 +466,7 @@
                                                                   ],
                                                       "entityKey":  "syncTasks",
                                                       "booleanActions":  0,
-                                                      "policyType":  99,
+                                                      "policyType":  100,
                                                       "enabled":  true
                                                   }
                                               ]

Documentation/ObjectInfo/enterprisedataprotection_windows10enterprisedataprotection.json

@@ -18,7 +18,7 @@
                                                                                                                                                        ],
                                                                                                                                            "entityKey":  "Name(NL)",
                                                                                                                                            "booleanActions":  0,
-                                                                                                                                           "policyType":  77,
+                                                                                                                                           "policyType":  78,
                                                                                                                                            "enabled":  true
                                                                                                                                        }
                                                                                                                       },
@@ -36,7 +36,7 @@
                                                                                                                                                        ],
                                                                                                                                            "entityKey":  "Type(NL)",
                                                                                                                                            "booleanActions":  0,
-                                                                                                                                           "policyType":  77,
+                                                                                                                                           "policyType":  78,
                                                                                                                                            "enabled":  true
                                                                                                                                        }
                                                                                                                       }
@@ -52,7 +52,7 @@
 
                                                                                                                   ],
                                                                                                       "booleanActions":  0,
-                                                                                                      "policyType":  77,
+                                                                                                      "policyType":  78,
                                                                                                       "enabled":  true
                                                                                                   },
                                                                                                   {
@@ -72,7 +72,7 @@
                                                                                                                                            "entityKey":  "Publisher",
                                                                                                                                            "booleanActions":  0,
                                                                                                                                            "defaultValue":  "*",
-                                                                                                                                           "policyType":  77,
+                                                                                                                                           "policyType":  78,
                                                                                                                                            "enabled":  true
                                                                                                                                        }
                                                                                                                       },
@@ -91,7 +91,7 @@
                                                                                                                                            "entityKey":  "Product",
                                                                                                                                            "booleanActions":  0,
                                                                                                                                            "defaultValue":  "*",
-                                                                                                                                           "policyType":  77,
+                                                                                                                                           "policyType":  78,
                                                                                                                                            "enabled":  true
                                                                                                                                        }
                                                                                                                       },
@@ -110,7 +110,7 @@
                                                                                                                                            "entityKey":  "File",
                                                                                                                                            "booleanActions":  0,
                                                                                                                                            "defaultValue":  "*",
-                                                                                                                                           "policyType":  77,
+                                                                                                                                           "policyType":  78,
                                                                                                                                            "enabled":  true
                                                                                                                                        }
                                                                                                                       },
@@ -129,7 +129,7 @@
                                                                                                                                            "entityKey":  "Version",
                                                                                                                                            "booleanActions":  0,
                                                                                                                                            "defaultValue":  "*",
-                                                                                                                                           "policyType":  77,
+                                                                                                                                           "policyType":  78,
                                                                                                                                            "enabled":  true
                                                                                                                                        }
                                                                                                                       },
@@ -162,7 +162,7 @@
                                                                                                                                            "entityKey":  "VersionRule",
                                                                                                                                            "booleanActions":  0,
                                                                                                                                            "defaultValue":  "And Above",
-                                                                                                                                           "policyType":  77,
+                                                                                                                                           "policyType":  78,
                                                                                                                                            "enabled":  true
                                                                                                                                        }
                                                                                                                       }
@@ -178,7 +178,7 @@
 
                                                                                                                   ],
                                                                                                       "booleanActions":  0,
-                                                                                                      "policyType":  77,
+                                                                                                      "policyType":  78,
                                                                                                       "enabled":  true
                                                                                                   }
                                                                                               ],
@@ -195,7 +195,7 @@
                                                                            "entityKey":  "appRules",
                                                                            "booleanActions":  0,
                                                                            "defaultValue":  false,
-                                                                           "policyType":  77,
+                                                                           "policyType":  78,
                                                                            "enabled":  true
                                                                        },
                                                                        {
@@ -216,7 +216,7 @@
                                                                                                                                                        ],
                                                                                                                                            "entityKey":  "Name(NL)",
                                                                                                                                            "booleanActions":  0,
-                                                                                                                                           "policyType":  77,
+                                                                                                                                           "policyType":  78,
                                                                                                                                            "enabled":  true
                                                                                                                                        }
                                                                                                                       },
@@ -234,7 +234,7 @@
                                                                                                                                                        ],
                                                                                                                                            "entityKey":  "Type(NL)",
                                                                                                                                            "booleanActions":  0,
-                                                                                                                                           "policyType":  77,
+                                                                                                                                           "policyType":  78,
                                                                                                                                            "enabled":  true
                                                                                                                                        }
                                                                                                                       }
@@ -250,7 +250,7 @@
 
                                                                                                                   ],
                                                                                                       "booleanActions":  0,
-                                                                                                      "policyType":  77,
+                                                                                                      "policyType":  78,
                                                                                                       "enabled":  true
                                                                                                   },
                                                                                                   {
@@ -270,7 +270,7 @@
                                                                                                                                            "entityKey":  "Publisher",
                                                                                                                                            "booleanActions":  0,
                                                                                                                                            "defaultValue":  "*",
-                                                                                                                                           "policyType":  77,
+                                                                                                                                           "policyType":  78,
                                                                                                                                            "enabled":  true
                                                                                                                                        }
                                                                                                                       },
@@ -289,7 +289,7 @@
                                                                                                                                            "entityKey":  "Product",
                                                                                                                                            "booleanActions":  0,
                                                                                                                                            "defaultValue":  "*",
-                                                                                                                                           "policyType":  77,
+                                                                                                                                           "policyType":  78,
                                                                                                                                            "enabled":  true
                                                                                                                                        }
                                                                                                                       },
@@ -308,7 +308,7 @@
                                                                                                                                            "entityKey":  "File",
                                                                                                                                            "booleanActions":  0,
                                                                                                                                            "defaultValue":  "*",
-                                                                                                                                           "policyType":  77,
+                                                                                                                                           "policyType":  78,
                                                                                                                                            "enabled":  true
                                                                                                                                        }
                                                                                                                       },
@@ -327,7 +327,7 @@
                                                                                                                                            "entityKey":  "Version",
                                                                                                                                            "booleanActions":  0,
                                                                                                                                            "defaultValue":  "*",
-                                                                                                                                           "policyType":  77,
+                                                                                                                                           "policyType":  78,
                                                                                                                                            "enabled":  true
                                                                                                                                        }
                                                                                                                       },
@@ -360,7 +360,7 @@
                                                                                                                                            "entityKey":  "VersionRule",
                                                                                                                                            "booleanActions":  0,
                                                                                                                                            "defaultValue":  "And Above",
-                                                                                                                                           "policyType":  77,
+                                                                                                                                           "policyType":  78,
                                                                                                                                            "enabled":  true
                                                                                                                                        }
                                                                                                                       }
@@ -376,7 +376,7 @@
 
                                                                                                                   ],
                                                                                                       "booleanActions":  0,
-                                                                                                      "policyType":  77,
+                                                                                                      "policyType":  78,
                                                                                                       "enabled":  true
                                                                                                   }
                                                                                               ],
@@ -393,7 +393,7 @@
                                                                            "entityKey":  "appRules",
                                                                            "booleanActions":  0,
                                                                            "defaultValue":  false,
-                                                                           "policyType":  77,
+                                                                           "policyType":  78,
                                                                            "enabled":  true
                                                                        },
                                                                        {
@@ -428,7 +428,7 @@
                                                                                        ],
                                                                            "booleanActions":  0,
                                                                            "defaultValue":  0,
-                                                                           "policyType":  77,
+                                                                           "policyType":  78,
                                                                            "enabled":  true
                                                                        },
                                                                        {
@@ -443,7 +443,7 @@
 
                                                                                        ],
                                                                            "booleanActions":  0,
-                                                                           "policyType":  77,
+                                                                           "policyType":  78,
                                                                            "enabled":  true
                                                                        },
                                                                        {
@@ -462,7 +462,7 @@
                                                                                                                             ],
                                                                                                                 "entityKey":  "Description(NL)",
                                                                                                                 "booleanActions":  0,
-                                                                                                                "policyType":  77,
+                                                                                                                "policyType":  78,
                                                                                                                 "enabled":  true
                                                                                                             }
                                                                                            },
@@ -509,7 +509,7 @@
                                                                                                                             ],
                                                                                                                 "entityKey":  "Type(NL)",
                                                                                                                 "booleanActions":  0,
-                                                                                                                "policyType":  77,
+                                                                                                                "policyType":  78,
                                                                                                                 "enabled":  true
                                                                                                             }
                                                                                            },
@@ -527,7 +527,7 @@
                                                                                                                             ],
                                                                                                                 "entityKey":  "Location(NL)",
                                                                                                                 "booleanActions":  0,
-                                                                                                                "policyType":  77,
+                                                                                                                "policyType":  78,
                                                                                                                 "enabled":  true
                                                                                                             }
                                                                                            }
@@ -543,7 +543,7 @@
 
                                                                                        ],
                                                                            "booleanActions":  0,
-                                                                           "policyType":  77,
+                                                                           "policyType":  78,
                                                                            "enabled":  true
                                                                        },
                                                                        {
@@ -558,7 +558,7 @@
 
                                                                                        ],
                                                                            "booleanActions":  2,
-                                                                           "policyType":  77,
+                                                                           "policyType":  78,
                                                                            "enabled":  true
                                                                        },
                                                                        {
@@ -573,7 +573,7 @@
 
                                                                                        ],
                                                                            "booleanActions":  2,
-                                                                           "policyType":  77,
+                                                                           "policyType":  78,
                                                                            "enabled":  true
                                                                        },
                                                                        {
@@ -591,7 +591,7 @@
                                                                                        ],
                                                                            "entityKey":  "",
                                                                            "booleanActions":  0,
-                                                                           "policyType":  77,
+                                                                           "policyType":  78,
                                                                            "enabled":  true
                                                                        },
                                                                        {
@@ -607,7 +607,7 @@
                                                                                        ],
                                                                            "booleanActions":  2,
                                                                            "defaultValue":  false,
-                                                                           "policyType":  77,
+                                                                           "policyType":  78,
                                                                            "enabled":  true
                                                                        },
                                                                        {
@@ -623,7 +623,7 @@
                                                                                        ],
                                                                            "booleanActions":  2,
                                                                            "defaultValue":  false,
-                                                                           "policyType":  77,
+                                                                           "policyType":  78,
                                                                            "enabled":  true
                                                                        },
                                                                        {
@@ -644,7 +644,7 @@
 
                                                                                                                  ],
                                                                                                      "booleanActions":  0,
-                                                                                                     "policyType":  77,
+                                                                                                     "policyType":  78,
                                                                                                      "enabled":  true
                                                                                                  }
                                                                                              ],
@@ -654,7 +654,7 @@
                                                                            "entityKey":  "TODO bug 701262",
                                                                            "booleanActions":  0,
                                                                            "defaultValue":  false,
-                                                                           "policyType":  77,
+                                                                           "policyType":  78,
                                                                            "enabled":  true
                                                                        },
                                                                        {
@@ -670,7 +670,7 @@
                                                                                        ],
                                                                            "booleanActions":  2,
                                                                            "defaultValue":  false,
-                                                                           "policyType":  77,
+                                                                           "policyType":  78,
                                                                            "enabled":  true
                                                                        },
                                                                        {
@@ -686,7 +686,7 @@
                                                                                        ],
                                                                            "booleanActions":  2,
                                                                            "defaultValue":  false,
-                                                                           "policyType":  77,
+                                                                           "policyType":  78,
                                                                            "enabled":  true
                                                                        }
                                                                    ]

Documentation/ObjectInfo/expeditedcheckin_iosexpeditedcheckin.json

@@ -13,7 +13,7 @@
                                                  "entityKey":  "enableExpeditedCheckin",
                                                  "booleanActions":  2,
                                                  "defaultValue":  false,
-                                                 "policyType":  54,
+                                                 "policyType":  55,
                                                  "enabled":  true
                                              }
 }