Merge pull request #363 from Micke-K/Development

3.10.1 Release

.gitignore

@@ -1,7 +1,12 @@
 .vs/
 .vscode/
 .git/
-/CloudAPIPowerShellManagement.Log
-/CloudAPIPowerShellManagement.Lo_
-/Documentation/Get-LanguageStrings.ps1
-
+/*.Log
+/*.Lo_
+/*.csv
+/*.zip
+/*.new
+/*.old
+/Extensions/*.zip
+.gitignore
+CloudAPIPowerShellManagement.log

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 unpredictable 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 configured 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. 

CS/HttpFactoryWithProxy.cs

@@ -0,0 +1,42 @@
+using System;
+using System.Net;
+using System.Net.Http;
+using Microsoft.Identity.Client;
+
+public class HttpFactoryWithProxy : IMsalHttpClientFactory
+{
+    private static HttpClient _httpClient;
+
+    public HttpFactoryWithProxy(string proxyURI) : this(proxyURI, null, null)
+    {
+
+    }
+
+    public HttpFactoryWithProxy(string proxyURI, string proxyUserName = null, string proxyPassword = null)
+    {
+        if (_httpClient == null) 
+        {
+            var proxy = new WebProxy
+            {
+                Address = new Uri(proxyURI),
+                BypassProxyOnLocal = false,
+                UseDefaultCredentials = false,
+                Credentials = new NetworkCredential(
+                    userName: proxyUserName,
+                    password: proxyPassword)
+            };
+
+            var httpClientHandler = new HttpClientHandler
+            {
+                Proxy = proxy,
+            };
+
+            _httpClient = new HttpClient(handler: httpClientHandler);
+        }
+    }
+
+    public HttpClient GetHttpClient()
+    {
+        return _httpClient;
+    }
+}

CloudAPIPowerShellManagement.psm1

@@ -69,14 +69,90 @@ function Initialize-CloudAPIManagement
         [string]
         $View = "",
         [switch]
-        $ShowConsoleWindow
+        $ShowConsoleWindow,
+        [switch]
+        $JSonSettings,
+        [string]
+        $JSonFile,
+        [switch]
+        $Silent,
+        [string]
+        $SilentBatchFile,
+        [string]
+        $tenantId,
+        [string]
+        $appId,
+        [string]
+        $secret,
+        [string]
+        $certificate,
+        [string]
+        $GraphEnvironment,
+        [string]
+        $GCCType
+
     )
 
+    $PSModuleAutoloadingPreference = "none"
+
     $global:wpfNS = "xmlns='http://schemas.microsoft.com/winfx/2006/xaml/presentation' xmlns:x='http://schemas.microsoft.com/winfx/2006/xaml'"
 
     [void] [System.Reflection.Assembly]::LoadWithPartialName("System.Windows.Forms") 
     Add-Type -AssemblyName PresentationFramework
 
+    [Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12
+
+    $global:hideUI = ($Silent -eq $true)
+    $global:SilentBatchFile = $SilentBatchFile
+
+    if($tenantId)
+    {
+        Write-Host "Using Tenant Id: $tenantId"
+        $global:AzureAppId = $appId 
+        $global:ClientSecret = $secret 
+        $global:ClientCert = $certificate
+        $global:UseGraphEnvironment = $GraphEnvironment
+        $global:UseGCCType = $GCCType
+
+        if($global:AzureAppId)
+        {
+            Write-Host "Using Azure App Id: $($global:AzureAppId)"
+        }
+        else
+        {
+            Write-Warning "Azure App Id is missing. Use -AppId <AppID> on the command line"
+        }
+
+        if($global:ClientSecret -or $global:ClientCert)
+        {
+            if($global:ClientSecret)
+            {
+                Write-Host "Using Azure App Secret"
+            }
+            else
+            {
+                Write-Host "Using Azure App Certificate"
+            }            
+        }
+        else
+        {
+            Write-Warning "Azure App Secret or Certificate is missing. Use -Secret <Secret> or -Certificate <Certificate> on the command line"
+        }
+
+        if($global:UseGraphEnvironment)
+        {
+            Write-Host "Using Azure Graph Environment: $($global:UseGraphEnvironment)"
+        }
+
+        if($global:UseGCCType)
+        {
+            Write-Host "Using Graph Environment type: $($global:UseGCCType)"
+        }
+    }
+
+    if($global:hideUI -ne $true)
+    {                
+        # Run with UI
         try 
         {
             [xml]$xaml = Get-Content ([IO.Path]::GetDirectoryName($PSCommandPath) + "\Xaml\SplashScreen.xaml")
@@ -93,17 +169,48 @@ function Initialize-CloudAPIManagement
         {
             
         }
+    }
+    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
+
 
     if($ShowConsoleWindow -ne $true)
     {
         Hide-Console
     }
 
+    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
 
+    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 than the portal.
 
 The objects can be documented in three ways:
 
@@ -28,7 +28,7 @@ Please read the [Deep Dive](#deep-dive) section  below for a detailed descriptio
 
 The script can document the objects in any language supported by Intune. 
 
-Note that some profiles and properties does not have language support. These will be documented in English.
+Note that some profiles and properties do not have language support. These will be documented in English.
 
 **Known Issues**
 
@@ -36,7 +36,7 @@ This is the first version of the documentation support.
 
 * There are over 100 different object types. Not all are supported and not all supported object types are tested and verified. 
 
-* Property based profiles might be missing some properties. Some properties in the translation files are generated at runtime. Support for these properties are added in the custom documentation provider
+* Property based profiles might be missing some properties. Some properties in the translation files are generated at runtime. Support for these properties are added in the custom documentation provider.
 
 * Some complex type properties are not translated in this version e.g. the screen layout of apps on the iPhone. 
 
@@ -52,7 +52,9 @@ This is the first version of the documentation support.
 
 * Some Endpoint Security polices are NOT deviceManagementIntent objects. They are actually Settings Catalog objects and they will be listed with the Settings Catalog items e.g. *Antivirus - Windows 10 and Windows Server (ConfigMgr)* policies
 
-* 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
+* Some Endpoint Security/Settings Catalog items are 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. 
 
@@ -64,7 +66,7 @@ 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
 
@@ -91,17 +93,17 @@ Property based objects are very complex to document. These objects can be docume
 * PowerShell function
 * Or a combination of PowerShell and manually created json files 
 
-Json files for translating property objects to documentation is located in the Documentation\ObjectInfo folder. All files that start with a # is manually created. These can either be based on the object type (@OData.Type) or the Object Type Id (specified in the EndpointManager.psm1 file). Files that does not start with a # are automatically generated and the `ObjectCategories.json` file contains the mapping between the Intune object and associated json files. One object type can be associated with multiple files. Each file represents one category of the object.
+Json files for translating property objects to documentation is located in the Documentation\ObjectInfo folder. All files that start with a # are manually created. These can either be based on the object type (@OData.Type) or the Object Type Id (specified in the EndpointManager.psm1 file). Files that does not start with a # are automatically generated and the `ObjectCategories.json` file contains the mapping between the Intune object and associated json files. One object type can be associated with multiple files. Each file represents one category of the object.
 
 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.
 
 **Language Support**
 
-The Settings based objects get their language strings from Graph APIs with a few exemptions.
+The Settings based objects get their language strings from Graph APIs with a few exceptions.
 
 The property based objects uses static language files. Each language file is generated based on multiple language files. Not all the language information is included in these files to reduce the output size. This could reduce the possibility to create custom documentation with multi language support.
 
@@ -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 generate 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 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 providers have 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

@@ -2,145 +2,155 @@
     "0":  "AirPlay",
     "1":  "AirPrint",
     "2":  "AndroidDeviceOwnerApplications",
-    "3":  "ApplicationGuard",
-    "4":  "ApplicationRestrictions",
-    "5":  "ApplicationVisibility",
-    "6":  "Applications",
-    "7":  "ApplicationsAndGames",
-    "8":  "ApplicationsAndGoogle",
-    "9":  "AppManagement",
-    "10":  "AppsAndExperience",
-    "11":  "AssociatedDomains",
-    "12":  "AutonomousSingleAppMode",
-    "13":  "AzureOperationalInsights",
-    "14":  "BitLocker",
-    "15":  "Browser",
-    "16":  "BuiltinApps",
-    "17":  "Cellular",
-    "18":  "CloudAndStorage",
-    "19":  "CloudPrint",
-    "20":  "ConnectedDevices",
-    "21":  "Connectivity",
-    "22":  "ContentCaching",
-    "23":  "ControlPanelAndSettings",
-    "24":  "CredentialGuard",
-    "25":  "CustomConfiguration",
-    "26":  "CustomOMASettings",
-    "27":  "CustomPreferences",
-    "28":  "Defender",
-    "29":  "DefenderExclusions",
-    "30":  "DefenderExploitGuard",
-    "31":  "DefenderSecurityCenter",
-    "32":  "DefenderLocalSecurityOptions",
-    "33":  "DefenderFirewall",
-    "34":  "DeliveryOptimization",
-    "35":  "DerivedCredentialAuthenticationConfiguration",
-    "36":  "DeviceHealth",
-    "37":  "DeviceAccount",
-    "38":  "DeviceGuard",
-    "39":  "DevicePassword",
-    "40":  "DeviceProperties",
-    "41":  "DeviceRestrictions",
-    "42":  "DeviceSecurity",
-    "43":  "DeviceExperience",
-    "44":  "Display",
-    "45":  "Domains",
-    "46":  "EditionUpgrade",
-    "47":  "SMode",
-    "48":  "EdgeBrowser",
-    "49":  "EdgeBrowserSmartScreen",
-    "50":  "EnterpriseDataProtection",
-    "51":  "EducationTeacherCerts",
-    "52":  "EducationStudentCerts",
-    "53":  "EducationTakeATest",
-    "54":  "EmailProfile",
-    "55":  "ExpeditedCheckin",
-    "56":  "ExtensibleSingleSignOn",
-    "57":  "FileVault",
-    "58":  "Firewall",
-    "59":  "Gatekeeper",
-    "60":  "HealthMonitoring",
-    "61":  "HomeScreenLayout",
-    "62":  "ComplianceEmailProfile",
-    "63":  "IosEducation",
-    "64":  "IOSWallpaper",
-    "65":  "ImportedPFX",
-    "66":  "KernelExtensions",
-    "67":  "KeyboardAndDictionary",
-    "68":  "Kiosk",
-    "69":  "KioskAndroidEnterprise",
-    "70":  "KioskConfiguration",
-    "71":  "KioskConfigurationV2",
-    "72":  "KioskWebBrowser",
-    "73":  "EdgeKiosk",
-    "74":  "LockedScreenExperience",
-    "75":  "LockScreenMessage",
-    "76":  "Logging",
-    "77":  "LoginItems",
-    "78":  "LoginWindow",
-    "79":  "Malware",
-    "80":  "Maintenance",
-    "81":  "Messaging",
-    "82":  "NetworkProxy",
-    "83":  "NetworkBoundary",
-    "84":  "Notifications",
-    "85":  "Password",
-    "86":  "Personalization",
-    "87":  "PersonalProfile",
-    "88":  "PKCS",
-    "89":  "PolicyOverride",
-    "90":  "PowerSettings",
-    "91":  "Printer",
-    "92":  "Privacy",
-    "93":  "PrivacyPerApp",
-    "94":  "PrivacyPreferences",
-    "95":  "Projection",
-    "96":  "SCEPProperties",
-    "97":  "SharedDevice",
-    "98":  "SharedPCAccountManager",
-    "99":  "SingleSignOn",
-    "100":  "Search",
-    "101":  "Session",
-    "102":  "SmartScreen",
-    "103":  "SoftwareUpdates",
-    "104":  "Start",
-    "105":  "SystemExtensions",
-    "106":  "SystemSecurity",
-    "107":  "SCCMCompliance",
-    "108":  "TrustedCert",
-    "109":  "Unsupported",
-    "110":  "Updates",
-    "111":  "UsersAndAccounts",
-    "112":  "WiFi",
-    "113":  "Win10Wifi",
-    "114":  "WindowsAtp",
-    "115":  "WindowsSpotlight",
-    "116":  "Wireless",
-    "117":  "WirelessProjection",
-    "118":  "WorkProfile",
-    "119":  "WorkProfilePassword",
-    "120":  "VPN",
-    "121":  "VPNApps",
-    "122":  "VPNConnectivity",
-    "123":  "VPNSplitTunneling",
-    "124":  "VPNAppsAndTrafficRules",
-    "125":  "VPNConditionalAccess",
-    "126":  "VPNDNSTriggers",
-    "127":  "VPNIKEv2",
-    "128":  "VPNProxy",
-    "129":  "VPNTrustedNetwork",
-    "130":  "WebContentFilter",
-    "131":  "XboxServices",
-    "132":  "DomainJoin",
-    "133":  "WindowsDefenderAtp",
-    "134":  "WindowsHelloForBusiness",
-    "135":  "DeviceFirmwareConfigurationInterface",
-    "136":  "ZebraMx",
-    "137":  "AndroidDefenderAtp",
-    "138":  "MacDefenderAtp",
-    "139":  "UserRights",
-    "140":  "WiredNetwork",
-    "141":  "DefenderAntivirus",
-    "142":  "CustomCompliance",
-    "143":  "IosDefenderAtp"
+    "3":  "AndroidDeviceOwnerPolicyMessages",
+    "4":  "ApplicationGuard",
+    "5":  "ApplicationRestrictions",
+    "6":  "ApplicationVisibility",
+    "7":  "Applications",
+    "8":  "ApplicationsAndGames",
+    "9":  "ApplicationsAndGoogle",
+    "10":  "AppManagement",
+    "11":  "AppsAndExperience",
+    "12":  "AssociatedDomains",
+    "13":  "AutonomousSingleAppMode",
+    "14":  "AzureOperationalInsights",
+    "15":  "BitLocker",
+    "16":  "BootOptions",
+    "17":  "Browser",
+    "18":  "BuiltinApps",
+    "19":  "Cameras",
+    "20":  "Cellular",
+    "21":  "CloudAndStorage",
+    "22":  "CloudPrint",
+    "23":  "ConnectedDevices",
+    "24":  "Connectivity",
+    "25":  "ContentCaching",
+    "26":  "ControlPanelAndSettings",
+    "27":  "CredentialGuard",
+    "28":  "CustomConfiguration",
+    "29":  "CustomOMASettings",
+    "30":  "CustomPreferences",
+    "31":  "Defender",
+    "32":  "DefenderExclusions",
+    "33":  "DefenderExploitGuard",
+    "34":  "DefenderSecurityCenter",
+    "35":  "DefenderLocalSecurityOptions",
+    "36":  "DefenderFirewall",
+    "37":  "DeliveryOptimization",
+    "38":  "DerivedCredentialAuthenticationConfiguration",
+    "39":  "DeviceHealth",
+    "40":  "DeviceAccount",
+    "41":  "DeviceGuard",
+    "42":  "DevicePassword",
+    "43":  "DeviceProperties",
+    "44":  "DeviceRestrictions",
+    "45":  "DeviceSecurity",
+    "46":  "DeviceExperience",
+    "47":  "DFCISecuritySettings",
+    "48":  "Display",
+    "49":  "Domains",
+    "50":  "EditionUpgrade",
+    "51":  "SMode",
+    "52":  "EdgeBrowser",
+    "53":  "EdgeBrowserSmartScreen",
+    "54":  "EnterpriseDataProtection",
+    "55":  "EducationTeacherCerts",
+    "56":  "EducationStudentCerts",
+    "57":  "EducationTakeATest",
+    "58":  "EmailProfile",
+    "59":  "ExpeditedCheckin",
+    "60":  "ExtensibleSingleSignOn",
+    "61":  "FileVault",
+    "62":  "Firewall",
+    "63":  "Gatekeeper",
+    "64":  "HealthMonitoring",
+    "65":  "HomeScreenLayout",
+    "66":  "ComplianceEmailProfile",
+    "67":  "IosEducation",
+    "68":  "IOSWallpaper",
+    "69":  "ImportedPFX",
+    "70":  "KernelExtensions",
+    "71":  "KeyboardAndDictionary",
+    "72":  "Kiosk",
+    "73":  "KioskAndroidEnterprise",
+    "74":  "KioskConfiguration",
+    "75":  "KioskConfigurationV2",
+    "76":  "KioskWebBrowser",
+    "77":  "EdgeKiosk",
+    "78":  "LockedScreenExperience",
+    "79":  "LockScreenMessage",
+    "80":  "Logging",
+    "81":  "LoginItems",
+    "82":  "LoginWindow",
+    "83":  "Malware",
+    "84":  "Maintenance",
+    "85":  "Messaging",
+    "86":  "MicrophonesAndSpeakers",
+    "87":  "NetworkProxy",
+    "88":  "NetworkBoundary",
+    "89":  "Notifications",
+    "90":  "Password",
+    "91":  "Personalization",
+    "92":  "PersonalProfile",
+    "93":  "PKCS",
+    "94":  "PolicyOverride",
+    "95":  "Ports",
+    "96":  "PowerSettings",
+    "97":  "Printer",
+    "98":  "Privacy",
+    "99":  "PrivacyPerApp",
+    "100":  "PrivacyPreferences",
+    "101":  "Projection",
+    "102":  "Radios",
+    "103":  "SCEPProperties",
+    "104":  "SharedDevice",
+    "105":  "SharedPCAccountManager",
+    "106":  "SingleSignOn",
+    "107":  "Search",
+    "108":  "Session",
+    "109":  "SmartScreen",
+    "110":  "SoftwareUpdates",
+    "111":  "Start",
+    "112":  "SystemExtensions",
+    "113":  "SystemSecurity",
+    "114":  "SCCMCompliance",
+    "115":  "TrustedCert",
+    "116":  "UEFIAccess",
+    "117":  "Unsupported",
+    "118":  "Updates",
+    "119":  "UsersAndAccounts",
+    "120":  "WakeSettings",
+    "121":  "WiFi",
+    "122":  "Win10Wifi",
+    "123":  "WindowsAtp",
+    "124":  "WindowsSpotlight",
+    "125":  "Wireless",
+    "126":  "WirelessProjection",
+    "127":  "WorkProfile",
+    "128":  "WorkProfilePassword",
+    "129":  "VPN",
+    "130":  "VPNApps",
+    "131":  "VPNConnectivity",
+    "132":  "VPNSplitTunneling",
+    "133":  "VPNAppsAndTrafficRules",
+    "134":  "VPNConditionalAccess",
+    "135":  "VPNDNSTriggers",
+    "136":  "VPNIKEv2",
+    "137":  "VPNProxy",
+    "138":  "VPNTrustedNetwork",
+    "139":  "VPNCustomData",
+    "140":  "WebContentFilter",
+    "141":  "XboxServices",
+    "142":  "DomainJoin",
+    "143":  "WindowsDefenderAtp",
+    "144":  "WindowsHelloForBusiness",
+    "145":  "ZebraMx",
+    "146":  "AndroidDefenderAtp",
+    "147":  "MacDefenderAtp",
+    "148":  "UserRights",
+    "149":  "WiredNetwork",
+    "150":  "DefenderAntivirus",
+    "151":  "CustomCompliance",
+    "152":  "IosDefenderAtp",
+    "153":  "WSLCompliance"
 }

Documentation/DefaultHTMLStyle.css

@@ -0,0 +1,184 @@
+<style type="text/css">
+    
+html { }
+
+html,body {
+    margin:0;
+    padding:5px;
+    position:relative;
+}
+
+.header-level1 {
+    font-family:"Arial",sans-serif;
+    font-size: 18px;
+    margin-top: 0px;
+    margin-bottom: 0px;
+}
+
+.header-level2 {
+    font-family:"Arial",sans-serif;
+    font-size: 16px;
+    margin-top: 3px;
+    margin-bottom: 0px;
+}
+
+.header-level3 {
+    font-family:"Arial",sans-serif;
+    font-size: 14px;
+    margin-top: 3px;
+    margin-bottom: 0px;
+}
+
+.header-level4 {
+    font-family:"Arial",sans-serif;
+    font-size: 12px;
+    margin-top: 3px;
+    margin-bottom: 0px;
+}
+
+.header-level6 {
+    font-family:"Arial",sans-serif;
+    font-size: 10px;
+    margin-top: 3px;
+}
+
+.table-settings {
+    border: 1px solid #999999;
+    padding-right: 5px;
+    font-family:"Arial",sans-serif;
+    font-size: 11px;
+}
+
+.table-settings TR:nth-child(even) {
+    background-color: #FAFAFA
+}
+
+.table-settings th {
+    background-color: #D0D0D0;
+    padding: 0px;
+    text-align:left;
+    font-size: 12px;
+    padding-right: 10px;
+    padding-top: 3px;
+    font-weight: bold;
+    border-width: 5px;
+    padding: 5px;
+    border-style: none;
+    border-color: #F2F2F2;
+}
+
+.table-settings td {
+    text-align:left;
+    padding-right: 5px;
+    border-width: 5px;
+    padding: 5px;
+    border-style: none;
+    border-color: #F2F2F2;
+    border-bottom: 1px solid #ddd;
+}
+
+.code {
+    background: #f4f4f4;
+    border: 1px solid #ddd;
+    border-left: 3px solid #333333;
+    color: #666;
+    page-break-inside: avoid;
+    font-family: monospace;
+    font-size: 12px;
+    line-height: 1.6;
+    margin-bottom: 2px;
+    max-width: 100%;
+    overflow: auto;
+    padding: 1em 1.5em;
+    display: block;
+    word-wrap: break-word;
+}
+
+.description summary {
+    list-style: none;
+    cursor: pointer;
+}
+
+details.description[open] summary::after {
+  content: attr(data-open);
+}
+
+details.description:not([open]) summary::after {
+  content: attr(data-close);
+}
+
+.row-even {
+    
+}
+
+.row-odd {
+    
+}
+
+.category-level1 {
+    background-color: #E0E0E0;
+    font-size: 11px;
+    font-weight: bold;
+}
+
+.category-level2 {
+    background-color: #E0E0E0;
+    font-size: 11px;
+}
+
+.anchor-style {
+    font-family:"Arial",sans-serif;
+    font-size: 11px;
+}
+
+.anchor-level2 {
+
+}
+
+.anchor-level3 {
+    padding-left: 5px;
+}
+
+.anchor-level4 {
+    padding-left: 10px;
+}
+
+.anchor-level5 {
+    padding-left: 15px;
+}
+
+.table-value {
+    border: 0px;
+    width: 100%;
+    padding: 0px;
+    font-family:"Arial",sans-serif;
+    font-size: 11px;
+}
+
+.table-value th {
+    background-color: #F9F9F9;
+    padding: 0px;
+    text-align:left;
+    font-size: 11px;
+    padding-right: 0px;
+    padding-top: 3px;
+    padding-bottom: 3px;
+    font-weight: normal;
+    border-width: 0px;
+    border-style: none;
+}
+
+.table-value tr {
+    background-color: #FFFFFF;
+}
+
+.table-value td {
+    border-bottom: 0;
+    padding: 1px;
+}
+
+.row-new-property {
+    background-color: #E7E7E7 !important;
+}
+
+</style>

Documentation/DefaultMDStyle.css

@@ -0,0 +1,117 @@
+<style type="text/css">
+    
+html { }
+
+html,body {
+    margin:0;
+    padding:0 px;
+    position:relative;
+}
+
+h6 {
+    margin-top: 2px !important;
+}
+
+.table-settings {
+    padding-right: 5px;
+    font-family:"Arial",sans-serif;
+    font-size: 11px;
+    margin-bottom: 0px !important;
+}
+
+.table-settings p {
+    margin-bottom: 0px !important;
+}
+
+.table-settings TR:nth-child(even) {
+    background-color: #FAFAFA
+}
+
+.table-settings td {
+    text-align:left;
+    border-width: 5px;
+    padding: 5px !important;
+    border-style: none;
+    border-color: #F2F2F2;
+    border-bottom: 1px solid #ddd;
+}
+
+.table-header1 td {
+    background-color: #D0D0D0;
+    text-align: left;
+    font-size: 12px;
+    font-weight: bold;
+    border-width: 5px;
+    padding: 5px;
+    border-style: none;
+    border-color: #F2F2F2;
+}
+
+.category-level1 {
+    background-color: #E0E0E0;
+    font-size: 11px;
+    font-weight: bold;
+}
+
+.category-level2 {
+    background-color: #E0E0E0;
+    font-size: 11px;
+}
+
+.anchor-style {
+    font-family:"Arial",sans-serif;
+    font-size: 11px;
+}
+
+.anchor-level2 {
+
+}
+
+.table-value {
+    border: 0px;
+    width: 100%;
+    padding: 0px;
+    font-family:"Arial",sans-serif;
+    font-size: 11px;
+}
+
+.table-value th {
+    background-color: #F9F9F9;
+    padding: 0px;
+    text-align:left;
+    font-size: 11px;
+    padding-right: 0px;
+    padding-top: 3px;
+    padding-bottom: 3px;
+    font-weight: normal;
+    border-width: 0px;
+    border-style: none;
+}
+
+.table-value tr {
+    background-color: #FFFFFF;
+}
+
+.table-value td {
+    border-bottom: 0;
+    padding: 1px;
+}
+
+.row-new-property {
+    background-color: #E7E7E7 !important;
+}
+
+.description summary {
+    list-style: none;
+    cursor: pointer;
+}
+
+details.description[open] summary::after {
+  content: attr(data-open);
+}
+
+details.description:not([open]) summary::after {
+  content: attr(data-close);
+}
+
+</style>

Documentation/ObjectInfo/#AppConfigOutlookDevice.json

@@ -11,7 +11,7 @@
         "entityKey":  "configureEmail",
         "dataType":  0,
         "booleanActions":  109,
-        "category": 103
+        "category": "SettingDetails.configurationSettingsTitle"
     },
     {
         "nameResourceKey":  "Inputs.authenticationType",
@@ -19,7 +19,7 @@
         "entityKey":  "com.microsoft.outlook.EmailProfile.AccountType",
         "dataType":  16,
         "booleanActions":  0,
-        "category": 103,
+        "category": "SettingDetails.configurationSettingsTitle",
         "options":  [                                
             {
                 "nameResourceKey":  "Inputs.basicAuth",
@@ -37,7 +37,7 @@
         "entityKey":  "com.microsoft.outlook.EmailProfile.EmailUPN",
         "dataType":  16,
         "booleanActions":  0,
-        "category": 103,
+        "category": "SettingDetails.configurationSettingsTitle",
         "options":  [                                
             {
                 "nameResourceKey":  "userPrincipalNameOption",
@@ -58,7 +58,7 @@
         "entityKey":  "com.microsoft.outlook.EmailProfile.AccountDomain",
         "dataType":  20,
         "booleanActions":  0,
-        "category": 103,
+        "category": "SettingDetails.configurationSettingsTitle",
         "Condition": {
             "Expressions": [
                 {
@@ -74,7 +74,7 @@
         "entityKey":  "com.microsoft.outlook.EmailProfile.EmailAddress",
         "dataType":  16,
         "booleanActions":  0,
-        "category": 103,
+        "category": "SettingDetails.configurationSettingsTitle",
         "options":  [                                
             {
                 "nameResourceKey":  "userPrincipalNameOption",
@@ -92,7 +92,7 @@
         "entityKey":  "com.microsoft.outlook.EmailProfile.ServerHostName",
         "dataType":  20,
         "booleanActions":  0,
-        "category": 103,
+        "category": "SettingDetails.configurationSettingsTitle",
         "Condition": {
             "Expressions": [
                 {
@@ -108,7 +108,7 @@
         "entityKey":  "com.microsoft.outlook.EmailProfile.EmailAccountName",
         "dataType":  20,
         "booleanActions":  0,
-        "category": 103,
+        "category": "SettingDetails.configurationSettingsTitle",
         "Condition": {
             "Expressions": [
                 {
@@ -124,7 +124,7 @@
         "entityKey":  "IntuneMAMAllowedAccountsOnly",
         "dataType":  16,
         "booleanActions":  0,
-        "category": 103,
+        "category": "SettingDetails.configurationSettingsTitle",
         "Condition": {
             "Expressions": [
                 {
@@ -158,7 +158,7 @@
         "entityKey":  "com.microsoft.outlook.Mail.FocusedInbox",
         "dataType":  0,
         "booleanActions":  120,
-        "category": 103
+        "category": "SettingDetails.configurationSettingsTitle"
     },
     {
         "nameResourceKey":  "OutlookAppConfig.allowBiometricsTitle",
@@ -166,17 +166,18 @@
         "entityKey":  "com.microsoft.outlook.Auth.Biometric",
         "dataType":  0,
         "booleanActions":  120,
-        "category": 103
-    },
+        "category": "SettingDetails.configurationSettingsTitle",
+        "ChildSettings": [
             {
                 "nameResourceKey":  "OutlookAppConfig.allowUserChangeTitle",
                 "descriptionResourceKey":  "",
                 "entityKey":  "com.microsoft.outlook.Auth.Biometric.UserChangeAllowed",
                 "dataType":  0,
                 "booleanActions":  109,
-        "unconfiguredValue": true,
                 "allowMissing": true,
-        "category": 103,
+                "unconfiguredValue": true,
+                "alwaysAddValue": true,
+                "category": "SettingDetails.configurationSettingsTitle",
                 "Condition": {
                     "Expressions": [
                         {
@@ -185,6 +186,8 @@
                         }
                     ]
                 }
+            }
+        ]
     },
     {
         "nameResourceKey":  "OutlookAppConfig.allowSaveContactsTitle",
@@ -192,17 +195,18 @@
         "entityKey":  "com.microsoft.outlook.Contacts.LocalSyncEnabled",
         "dataType":  0,
         "booleanActions":  120,
-        "category": 103
-    },
+        "category": "SettingDetails.configurationSettingsTitle",
+        "ChildSettings": [
             {
                 "nameResourceKey":  "OutlookAppConfig.allowUserChangeTitle",
                 "descriptionResourceKey":  "",
                 "entityKey":  "com.microsoft.outlook.Contacts.LocalSyncEnabled.UserChangeAllowed",
                 "dataType":  0,
                 "booleanActions":  109,
-        "unconfiguredValue": true,
                 "allowMissing": true,
-        "category": 103,
+                "unconfiguredValue": true,
+                "alwaysAddValue": true,
+                "category": "SettingDetails.configurationSettingsTitle",
                 "Condition": {
                     "Expressions": [
                         {
@@ -211,6 +215,8 @@
                         }
                     ]
                 }
+            }
+        ]
     },
     {
         "nameResourceKey":  "OutlookAppConfig.discoverFeedTitle",
@@ -218,7 +224,7 @@
         "entityKey":  "com.microsoft.outlook.Mail.officeFeedEnabled",
         "dataType":  0,
         "booleanActions":  120,
-        "category": 103        
+        "category": "SettingDetails.configurationSettingsTitle"        
     },
     {
         "nameResourceKey":  "OutlookAppConfig.allowSmartReplyTitle",
@@ -226,17 +232,18 @@
         "entityKey":  "com.microsoft.outlook.Mail.SuggestedRepliesEnabled",
         "dataType":  0,
         "booleanActions":  120,
-        "category": 103
-    },
+        "category": "SettingDetails.configurationSettingsTitle",
+        "ChildSettings": [
             {
                 "nameResourceKey":  "OutlookAppConfig.allowUserChangeTitle",
                 "descriptionResourceKey":  "",
                 "entityKey":  "com.microsoft.outlook.Mail.SuggestedRepliesEnabled.UserChangeAllowed",
                 "dataType":  0,
                 "booleanActions":  109,                
-        "category": 103,
-        "unconfiguredValue": true,
                 "allowMissing": true,
+                "unconfiguredValue": true,
+                "alwaysAddValue": true,
+                "category": "SettingDetails.configurationSettingsTitle",
                 "Condition": {
                     "Expressions": [
                         {
@@ -245,6 +252,8 @@
                         }
                     ]
                 }
+            }
+        ]
     },
     {
         "nameResourceKey":  "OutlookAppConfig.allowExternalRecipientsMailTipTitle",
@@ -252,7 +261,7 @@
         "entityKey":  "com.microsoft.outlook.Mail.ExternalRecipientsToolTipEnabled",
         "dataType":  0,
         "booleanActions":  120,
-        "category": 103
+        "category": "SettingDetails.configurationSettingsTitle"
     },
     {
         "nameResourceKey":  "OutlookAppConfig.allowDefaultAppSignatureTitle",
@@ -260,7 +269,7 @@
         "entityKey":  "com.microsoft.outlook.Mail.DefaultSignatureEnabled",
         "dataType":  0,
         "booleanActions":  120,
-        "category": 103
+        "category": "SettingDetails.configurationSettingsTitle"
     },
     {
         "nameResourceKey":  "OutlookAppConfig.blockExternalImagesTitle",
@@ -268,17 +277,18 @@
         "entityKey":  "com.microsoft.outlook.Mail.BlockExternalImagesEnabled",
         "dataType":  0,
         "booleanActions":  120,
-        "category": 103
-    },
+        "category": "SettingDetails.configurationSettingsTitle",
+        "ChildSettings": [
             {
                 "nameResourceKey":  "OutlookAppConfig.allowUserChangeTitle",
                 "descriptionResourceKey":  "",
                 "entityKey":  "com.microsoft.outlook.Mail.BlockExternalImagesEnabled.UserChangeAllowed",
                 "dataType":  0,
                 "booleanActions":  109,
-        "unconfiguredValue": true,
                 "allowMissing": true,
-        "category": 103,
+                "unconfiguredValue": true,
+                "alwaysAddValue": true,
+                "category": "SettingDetails.configurationSettingsTitle",
                 "Condition": {
                     "Expressions": [
                         {
@@ -287,6 +297,8 @@
                         }
                     ]
                 }
+            }
+        ]
     },
     {
         "nameResourceKey":  "OutlookAppConfig.OrganizeMailByThread.title",
@@ -294,7 +306,7 @@
         "entityKey":  "com.microsoft.outlook.Mail.OrganizeByThreadEnabled",
         "dataType":  0,
         "booleanActions":  120,
-        "category": 103
+        "category": "SettingDetails.configurationSettingsTitle"
     },
     {
         "nameResourceKey":  "OutlookAppConfig.playMyEmailsTitle",
@@ -302,7 +314,7 @@
         "entityKey":  "com.microsoft.outlook.Mail.PlayMyEmailsEnabled",
         "dataType":  0,
         "booleanActions":  120,
-        "category": 103
+        "category": "SettingDetails.configurationSettingsTitle"
     },
     {
         "nameResourceKey":  "OutlookAppConfig.themesEnabledTitle",
@@ -310,7 +322,7 @@
         "entityKey":  "com.microsoft.outlook.Settings.ThemesEnabled",
         "dataType":  0,
         "booleanActions":  120,
-        "category": 103
+        "category": "SettingDetails.configurationSettingsTitle"
     },
     {
         "nameResourceKey":  "OutlookAppConfig.textPredictionsTitle",
@@ -318,17 +330,18 @@
         "entityKey":  "com.microsoft.outlook.Mail.TextPredictionsEnabled",
         "dataType":  0,
         "booleanActions":  120,
-        "category": 103
-    },
+        "category": "SettingDetails.configurationSettingsTitle",
+        "ChildSettings": [
             {
                 "nameResourceKey":  "OutlookAppConfig.allowUserChangeTitle",
                 "descriptionResourceKey":  "",
                 "entityKey":  "com.microsoft.outlook.Mail.TextPredictionsEnabled.UserChangeAllowed",
                 "dataType":  0,
                 "booleanActions":  109,
-        "unconfiguredValue": true,
                 "allowMissing": true,
-        "category": 103,
+                "unconfiguredValue": true,
+                "alwaysAddValue": true,
+                "category": "SettingDetails.configurationSettingsTitle",
                 "Condition": {
                     "Expressions": [
                         {
@@ -338,4 +351,93 @@
                     ]
                 }            
             }
+        ]
+    },
+
+
+    {
+        "nameResourceKey":  "Inputs.outlookSMimeSettings",
+        "descriptionResourceKey":  "",
+        "dataType":  8,
+        "booleanActions":  0
+    },
+    {
+        "nameResourceKey":  "OutlookAppConfig.enableSMIMETitle",
+        "descriptionResourceKey":  "",
+        "entityKey":  "com.microsoft.outlook.Mail.SMIMEEnabled",
+        "dataType":  0,
+        "booleanActions":  109,
+        "category": "SettingDetails.requireSMIME",
+        "ChildSettings": [
+            {
+                "nameResourceKey":  "OutlookAppConfig.allowUserChangeTitle",
+                "descriptionResourceKey":  "",
+                "entityKey":  "com.microsoft.outlook.Mail.SMIMEEnabled.UserChangeAllowed",
+                "dataType":  0,
+                "booleanActions":  109,
+                "allowMissing": true,
+                "unconfiguredValue": true,
+                "alwaysAddValue": true,
+                "category": "SettingDetails.requireSMIME"
+            }
+        ]
+    },
+    {
+        "nameResourceKey":  "OutlookAppConfig.encryptAllEmails",
+        "descriptionResourceKey":  "",
+        "entityKey":  "com.microsoft.outlook.Mail.SMIMEEnabled.EncryptAllMail",
+        "dataType":  0,
+        "booleanActions":  109,
+        "category": "SettingDetails.requireSMIME",
+        "ChildSettings": [
+            {
+                "nameResourceKey":  "OutlookAppConfig.allowUserChangeTitle",
+                "descriptionResourceKey":  "",
+                "entityKey":  "com.microsoft.outlook.Mail.SMIMEEnabled.EncryptAllMail.UserChangeAllowed",
+                "dataType":  0,
+                "booleanActions":  109,
+                "allowMissing": true,
+                "unconfiguredValue": true,
+                "alwaysAddValue": true,
+                "category": "SettingDetails.requireSMIME"
+            }
+        ]
+    },
+    {
+        "nameResourceKey":  "OutlookAppConfig.signAllEmails",
+        "descriptionResourceKey":  "",
+        "entityKey":  "com.microsoft.outlook.Mail.SMIMEEnabled.SignAllMail",
+        "dataType":  0,
+        "booleanActions":  109,
+        "category": "SettingDetails.requireSMIME",
+        "ChildSettings": [
+            {
+                "nameResourceKey":  "OutlookAppConfig.allowUserChangeTitle",
+                "descriptionResourceKey":  "",
+                "entityKey":  "com.microsoft.outlook.Mail.SMIMEEnabled.SignAllMail.UserChangeAllowed",
+                "dataType":  0,
+                "booleanActions":  109,
+                "allowMissing": true,
+                "unconfiguredValue": true,
+                "alwaysAddValue": true,
+                "category": "SettingDetails.requireSMIME"
+            }
+        ]
+    },
+    {
+        "nameResourceKey":  "Inputs.ldapUrl",
+        "descriptionResourceKey":  "",
+        "entityKey":  "com.microsoft.outlook.Mail.SMIMEEnabled.LDAPHostName",
+        "dataType":  20,
+        "booleanActions":  0,
+        "category": "SettingDetails.requireSMIME"
+    },
+    {
+        "nameResourceKey":  "Inputs.deploySMimeCertsFromIntune",
+        "descriptionResourceKey":  "",
+        "entityKey":  "com.microsoft.outlook.Mail.SMIMEEnabled.CertsFromIntune",
+        "dataType":  0,
+        "booleanActions":  109,
+        "category": "SettingDetails.requireSMIME"
+    }
 ]

Documentation/ObjectInfo/#Applications.json

@@ -7,6 +7,96 @@
         "booleanActions":  0,
         "category": "AppInformationTab.name"
     },
+    {
+        "nameResourceKey":  "Inputs.packageIdLabel",
+        "descriptionResourceKey":  "",
+        "entityKey":  "packageIdentifier",
+        "dataType":  20,
+        "booleanActions":  0,
+        "category": "AppInformationTab.name",
+        "Condition": {                            
+            "Expressions": [
+                {
+                    "property": "@OData.Type",
+                    "value": "#microsoft.graph.winGetApp"
+                }                        
+            ]
+        } 
+    },
+    {
+        "nameResourceKey":  "Inputs.packageIdLabel",
+        "descriptionResourceKey":  "",
+        "entityKey":  "packageIdentifier",
+        "dataType":  107,
+        "booleanActions":  0,
+        "category": "AppInformationTab.name",
+        "value": "UWP",
+        "Condition": {
+            "type": "and",
+            "Expressions": [
+                {
+                    "property": "packageIdentifier",
+                    "value": "9*",
+                    "operator": "like"
+                },
+                {
+                    "property": "@OData.Type",
+                    "value": "#microsoft.graph.winGetApp"
+                }
+            ]
+        }
+    },
+    {
+        "nameResourceKey":  "Inputs.packageIdLabel",
+        "descriptionResourceKey":  "",
+        "entityKey":  "packageIdentifier",
+        "dataType":  107,
+        "booleanActions":  0,
+        "category": "AppInformationTab.name",
+        "value": "Win32",
+        "Condition": {
+            "type": "and",
+            "Expressions": [
+                {
+                    "property": "packageIdentifier",
+                    "value": "X*",
+                    "operator": "like"
+                },
+                {
+                    "property": "@OData.Type",
+                    "value": "#microsoft.graph.winGetApp"
+                }
+            ]
+        }
+    },
+    {
+        "nameResourceKey":  "Inputs.packageIdLabel",
+        "descriptionResourceKey":  "",
+        "entityKey":  "packageIdentifier",
+        "dataType":  107,
+        "booleanActions":  0,
+        "category": "AppInformationTab.name",
+        "value": "Unsupported Store Type",
+        "Condition": {
+            "type": "and",
+            "Expressions": [
+                {
+                    "property": "packageIdentifier",
+                    "value": "9*",
+                    "operator": "notlike"
+                },
+                {
+                    "property": "packageIdentifier",
+                    "value": "X*",
+                    "operator": "notlike"
+                },
+                {
+                    "property": "@OData.Type",
+                    "value": "#microsoft.graph.winGetApp"
+                }
+            ]
+        }
+    },    
     {
         "nameResourceKey":  "Inputs.displayVersionLabel",
         "descriptionResourceKey":  "",
@@ -351,6 +441,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 +499,12 @@
             }
         ],
         "Condition": {
+            "type": "and",
             "Expressions": [
+                {
+                    "property": "MSAppsConfigXml",
+                    "operator": "null"
+                },
                 {
                     "property": "@OData.Type",
                     "value": "#microsoft.graph.officeSuiteApp"
@@ -419,7 +530,12 @@
             }
         ],
         "Condition": {
+            "type": "and",
             "Expressions": [
+                {
+                    "property": "MSAppsConfigXml",
+                    "operator": "null"
+                },
                 {
                     "property": "@OData.Type",
                     "value": "#microsoft.graph.officeSuiteApp"
@@ -433,7 +549,12 @@
         "dataType":  8,
         "booleanActions":  0,
         "Condition": {
+            "type": "and",
             "Expressions": [
+                {
+                    "property": "MSAppsConfigXml",
+                    "operator": "null"
+                },
                 {
                     "property": "@OData.Type",
                     "value": "#microsoft.graph.officeSuiteApp"
@@ -459,7 +580,12 @@
             }
         ],
         "Condition": {
+            "type": "and",
             "Expressions": [
+                {
+                    "property": "MSAppsConfigXml",
+                    "operator": "null"
+                },
                 {
                     "property": "@OData.Type",
                     "value": "#microsoft.graph.officeSuiteApp"
@@ -497,7 +623,12 @@
             }
         ],
         "Condition": {
+            "type": "and",
             "Expressions": [
+                {
+                    "property": "MSAppsConfigXml",
+                    "operator": "null"
+                },
                 {
                     "property": "@OData.Type",
                     "value": "#microsoft.graph.officeSuiteApp"
@@ -513,7 +644,12 @@
         "booleanActions":  109,
         "category": "OfficeSuiteAppsTab.appSuiteConfigurationLabel",        
         "Condition": {
+            "type": "and",
             "Expressions": [
+                {
+                    "property": "MSAppsConfigXml",
+                    "operator": "null"
+                },
                 {
                     "property": "@OData.Type",
                     "value": "#microsoft.graph.officeSuiteApp"
@@ -529,7 +665,12 @@
         "booleanActions":  0,
         "category": "OfficeSuiteAppsTab.appSuiteConfigurationLabel",        
         "Condition": {
+            "type": "and",
             "Expressions": [
+                {
+                    "property": "MSAppsConfigXml",
+                    "operator": "null"
+                },
                 {
                     "property": "@OData.Type",
                     "value": "#microsoft.graph.officeSuiteApp"
@@ -543,7 +684,12 @@
         "dataType":  8,
         "booleanActions":  0,
         "Condition": {
+            "type": "and",
             "Expressions": [
+                {
+                    "property": "MSAppsConfigXml",
+                    "operator": "null"
+                },
                 {
                     "property": "@OData.Type",
                     "value": "#microsoft.graph.officeSuiteApp"
@@ -559,7 +705,12 @@
         "booleanActions":  109,
         "category": "OfficeSuiteAppsTab.appSuiteConfigurationLabel",        
         "Condition": {
+            "type": "and",
             "Expressions": [
+                {
+                    "property": "MSAppsConfigXml",
+                    "operator": "null"
+                },
                 {
                     "property": "@OData.Type",
                     "value": "#microsoft.graph.officeSuiteApp"
@@ -575,7 +726,12 @@
         "booleanActions":  109,
         "category": "OfficeSuiteAppsTab.appSuiteConfigurationLabel",        
         "Condition": {
+            "type": "and",
             "Expressions": [
+                {
+                    "property": "MSAppsConfigXml",
+                    "operator": "null"
+                },
                 {
                     "property": "@OData.Type",
                     "value": "#microsoft.graph.officeSuiteApp"
@@ -591,7 +747,12 @@
         "booleanActions":  109,
         "category": "OfficeSuiteAppsTab.appSuiteConfigurationLabel",        
         "Condition": {
+            "type": "and",
             "Expressions": [
+                {
+                    "property": "MSAppsConfigXml",
+                    "operator": "null"
+                },
                 {
                     "property": "@OData.Type",
                     "value": "#microsoft.graph.officeSuiteApp"
@@ -607,7 +768,12 @@
         "booleanActions":  0,
         "category": "OfficeSuiteAppsTab.appSuiteConfigurationLabel",        
         "Condition": {
+            "type": "and",
             "Expressions": [
+                {
+                    "property": "MSAppsConfigXml",
+                    "operator": "null"
+                },
                 {
                     "property": "@OData.Type",
                     "value": "#microsoft.graph.officeSuiteApp"
@@ -660,7 +826,12 @@
         "category": "OfficeSuiteAppsTab.appSuiteConfigurationLabel",
         "unconfiguredValue": "os-default",
         "Condition": {
+            "type": "and",
             "Expressions": [
+                {
+                    "property": "MSAppsConfigXml",
+                    "operator": "null"
+                },
                 {
                     "property": "@OData.Type",
                     "value": "#microsoft.graph.officeSuiteApp"
@@ -755,10 +926,24 @@
                 ]
             },
             {
+                "Columns": [
+                    {
+                        "metadata": {
+                            "entityKey": "returnCode",
+                            "nameResourceKey": "Win32ReturnCodes.Columns.returnCode"
+                        }
+                    },
+                    {
+                        "metadata": {
+                            "entityKey": "type",
+                            "nameResourceKey": "Win32ReturnCodes.Columns.codeType"
+                        }
+                    }
+                ],
                 "nameResourceKey":  "Win32ReturnCodes.selectorLabel",
                 "descriptionResourceKey":  "",
                 "entityKey":  "returnCodes",
-                "dataType":  20,
+                "dataType":  21,
                 "booleanActions":  0,
                 "category": "Win32Program.selectorLabel"
             },
@@ -811,10 +996,24 @@
                 "category": "Win32Requirements.selectorLabel"
             },
             {
+                "Columns": [
+                    {
+                        "metadata": {
+                            "entityKey": "property",
+                            "nameResourceKey": "ApplicabilityRules.GridLabel.property"
+                        }
+                    },
+                    {
+                        "metadata": {
+                            "entityKey": "value",
+                            "nameResourceKey": "ApplicabilityRules.GridLabel.value"
+                        }
+                    }
+                ],
                 "nameResourceKey":  "Win32Requirements.AdditionalRequirements.label",
                 "descriptionResourceKey":  "",
-                "entityKey":  "requirementRulesSummary",
-                "dataType":  20,
+                "entityKey":  "requirementRulesTranslated",
+                "dataType":  21,
                 "booleanActions":  0,
                 "category": "Win32Requirements.selectorLabel"
             },
@@ -827,10 +1026,24 @@
                 "category": "DetectionRules.selectorLabel"
             },
             {
+                "Columns": [
+                    {
+                        "metadata": {
+                            "entityKey": "property",
+                            "nameResourceKey": "ApplicabilityRules.GridLabel.property"
+                        }
+                    },
+                    {
+                        "metadata": {
+                            "entityKey": "value",
+                            "nameResourceKey": "ApplicabilityRules.GridLabel.value"
+                        }
+                    }
+                ],
                 "nameResourceKey":  "DetectionRules.selectorLabel",
                 "descriptionResourceKey":  "",
-                "entityKey":  "detectionRulesSummary",
-                "dataType":  20,
+                "entityKey":  "detectionRulesTranslated",
+                "dataType":  21,
                 "booleanActions":  0,
                 "category": "DetectionRules.selectorLabel",
                 "Condition": {                            
@@ -886,12 +1099,12 @@
                 "category": "SettingDetails.dependencyCategory"
             },
             {
-                "nameResourceKey":  "supersedenceCategory",
+                "nameResourceKey":  "AppRelationshipStatus.Tabs.supersedence",
                 "descriptionResourceKey":  "",
                 "entityKey":  "supersededApps",
                 "dataType":  20,
                 "booleanActions":  0,
-                "category": "SettingDetails.supersedenceCategory"
+                "category": "AppRelationshipStatus.Tabs.supersedence"
             }
         ]
     }    

Documentation/ObjectInfo/#AutoPilot.json

@@ -66,9 +66,20 @@
             {
                 "nameResourceKey":  "Autopilot.directoryServiceLabel",
                 "descriptionResourceKey":  "",
-                "dataType":  101,
+                "dataType":  16,
+                "entityKey":  "azureADJoinType",
                 "category":  "Autopilot.OOBE.title",
-                "value":  "Autopilot.DirectoryService.azureAD"
+                "booleanActions":  0,
+                "options":  [                                
+                                {
+                                    "nameResourceKey":  "Autopilot.DirectoryService.activeDirectoryAD",
+                                    "value":  "hybrid"
+                                },
+                                {
+                                    "nameResourceKey":  "Autopilot.DirectoryService.azureAD",
+                                    "value":  "azureAD"
+                                }
+                ]
             }
         ]
     },    
@@ -95,8 +106,8 @@
         "dataType":  102,
         "category":  "Autopilot.OOBE.title",
         "entityKey":  "language",
-        "booleanActions":  0
-    },    
+        "booleanActions":  0,
+        "ChildSettings": [
             {
                 "nameResourceKey":  "Autopilot.OOBE.title",
                 "descriptionResourceKey":  "",
@@ -104,6 +115,15 @@
                 "dataType":  6,
                 "booleanActions":  0,
                 "category": "Autopilot.OOBE.title",
+                "Condition": {
+                    "Expressions": [
+                        {
+                            "property": "language",
+                            "operator": "ne",
+                            "value": "user-select"
+                        }
+                    ]
+                },
                 "complexOptions":  [
                     {
                         "nameResourceKey":  "Autopilot.OOBE.skipKeyboardSelection",
@@ -111,8 +131,30 @@
                         "entityKey":  "skipKeyboardSelectionPage",
                         "dataType":  0,
                         "booleanActions":  109,
-                "category": "Autopilot.OOBE.title"
+                        "category": "Autopilot.OOBE.title",
+                        "Condition": {
+                            "type": "or",
+                            "Expressions": [
+                                {
+                                    "property": "isLanguageSet",
+                                    "value": true
+                                }
+                            ]
+                        }
+                    }
+                ]
+            }
+        ]        
     },      
+    {
+        "nameResourceKey":  "Autopilot.OOBE.title",
+        "descriptionResourceKey":  "",
+        "entityKey":  "outOfBoxExperienceSettings",
+        "dataType":  6,
+        "skipAddLevel": true,
+        "booleanActions":  0,
+        "category": "Autopilot.OOBE.title",
+        "complexOptions":  [            
             {
                 "nameResourceKey":  "Autopilot.OOBE.licenseAgreement",
                 "descriptionResourceKey":  "Autopilot.OOBE.licenseAgreementInfo",
@@ -169,7 +211,7 @@
         "nameResourceKey":  "Autopilot.OOBE.ApplyComputerNameTemplate.label",
         "descriptionResourceKey":  "Autopilot.OOBE.ApplyComputerNameTemplate.infoBalloon",
         "entityKey":  "applyDeviceNameTemplate",
-        "dataType":  103,
+        "dataType":  0,        
         "booleanActions":  109,
         "category": "Autopilot.OOBE.title",
         "ChildSettings": [

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

@@ -393,7 +393,7 @@
                 "value":  "notConfigured"
             },
             {
-                "nameResourceKey":  "microsoftEdge",
+                "nameResourceKey":  "microsoftEdgeOptionText",
                 "descriptionResourceKey":  "",
                 "value":  "microsoftEdge"
             },
@@ -543,7 +543,7 @@
     {
         "nameResourceKey":  "TAPSettings.Tap.numberOfDays",
         "descriptionResourceKey":  "",
-        "entityKey":  "pinRequiredInsteadOfBiometricTimeout",
+        "entityKey":  "periodBeforePinReset",
         "dataType":  100,
         "booleanActions":  0,
         "category": "SettingDetails.accessRequirements"

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

@@ -0,0 +1,43 @@
+[
+    {
+        "nameResourceKey":  "TableHeaders.configurationType",
+        "descriptionResourceKey":  "",
+        "entityKey":  "WindowsManagement.customAttributeObjectName",
+        "dataType":  200,
+        "booleanActions":  0,
+        "category": 1000
+    },
+    {
+        "nameResourceKey":  "WindowsManagement.CustomAttributes.customAttributeTypeLabel",
+        "descriptionResourceKey":  "",
+        "entityKey":  "customAttributeType",
+        "dataType":  16,
+        "booleanActions":  0,
+        "category": "WindowsManagement.scriptsettingsTabHeader",
+        "options":  [
+            {
+                "nameResourceKey":  "WindowsManagement.CustomAttributes.dateTypeOption",
+                "descriptionResourceKey":  "",
+                "value":  "date"
+            },
+            {
+                "nameResourceKey":  "WindowsManagement.CustomAttributes.stringTypeOption",
+                "descriptionResourceKey":  "",
+                "value":  "string"
+            },
+            {
+                "nameResourceKey":  "WindowsManagement.CustomAttributes.integerTypeOption",
+                "descriptionResourceKey":  "",
+                "value":  "integer"
+            }
+        ]        
+    },    
+    {
+        "nameResourceKey":  "WindowsManagement.customAttributeObjectName",
+        "descriptionResourceKey":  "",
+        "entityKey":  "fileName",
+        "dataType":  20,
+        "booleanActions":  0,
+        "category": "WindowsManagement.scriptsettingsTabHeader"
+    }
+]    

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.hardwareConfiguration.json

@@ -0,0 +1,34 @@
+[
+    {
+        "nameResourceKey":  "TableHeaders.configurationType",
+        "descriptionResourceKey":  "",
+        "entityKey":  "PolicyType.hardwareConfigurations",
+        "dataType":  200,
+        "booleanActions":  0,
+        "category": 1000
+    },
+    {
+        "nameResourceKey":  "HardwareConfig.Settings.Tab.Configurations.hardware",
+        "descriptionResourceKey":  "",
+        "entityKey":  "vendor",
+        "dataType":  20,
+        "booleanActions":  0,
+        "category": "SettingDetails.configurations"
+    },
+    {
+        "nameResourceKey":  "HardwareConfig.Settings.Tab.Configurations.perDevicePassword",
+        "descriptionResourceKey":  "",
+        "entityKey":  "perDevicePasswordDisabled",
+        "dataType":  109,
+        "booleanActions":  9,
+        "category": "SettingDetails.configurations"
+    },
+    {
+        "nameResourceKey":  "HardwareConfig.Settings.Tab.Configurations.file",
+        "descriptionResourceKey":  "",
+        "entityKey":  "fileName",
+        "dataType":  20,
+        "booleanActions":  0,
+        "category": "SettingDetails.configurations"
+    }
+]

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

@@ -306,7 +306,7 @@
     {
         "nameResourceKey":  "TAPSettings.EncryptData.label",
         "descriptionResourceKey":  "TAPSettings.EncryptData.tooltip",
-        "entityKey":  "appDataEncryptionType",
+        "entityKey":  "encryptOrgData",
         "dataType":  0,
         "booleanActions":  101,
         "category": "SettingDetails.dataProtection",
@@ -354,7 +354,7 @@
                 "value":  "notConfigured"
             },
             {
-                "nameResourceKey":  "microsoftEdge",
+                "nameResourceKey":  "microsoftEdgeOptionText",
                 "descriptionResourceKey":  "",
                 "value":  "microsoftEdge"
             },
@@ -398,14 +398,12 @@
             }
         ]
     },
+
+
     {
         "dataType":  8,
         "nameResourceKey":  "empty"
     }, 
-
-
-
-    
     {
         "nameResourceKey":  "TAPSettings.PinAccess.label",
         "descriptionResourceKey":  "TAPSettings.PinAccess.tooltip",
@@ -496,17 +494,17 @@
     {
         "nameResourceKey":  "TAPSettings.Tap.numberOfDays",
         "descriptionResourceKey":  "",
-        "entityKey":  "pinRequiredInsteadOfBiometricTimeout",
+        "entityKey":  "periodBeforePinReset",
         "dataType":  100,
         "booleanActions":  0,
         "category": "SettingDetails.accessRequirements"
     },
     {
-        "nameResourceKey":  "TAPSettings.Tap.previousPinBlockCount",
-        "descriptionResourceKey":  "",
-        "entityKey":  "previousPinBlockCount",
-        "dataType":  14,
-        "booleanActions":  0,
+        "nameResourceKey":  "TAPSettings.AppPIN.label",
+        "descriptionResourceKey":  "TAPSettings.AppPIN.tooltip",
+        "entityKey":  "disableAppPinIfDevicePinIsSet",
+        "dataType":  0,
+        "booleanActions":  201,
         "category": "SettingDetails.accessRequirements"
     },
     {

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

@@ -5,7 +5,7 @@
         "entityKey":  "versionInfo",
         "dataType":  20,
         "booleanActions":  0,
-        "category":  103
+        "category":  "TableHeaders.settings"
     },
     {
         "nameResourceKey":  "SoftwareUpdates.IosUpdatePolicy.Settings.Schedule.label",
@@ -13,7 +13,7 @@
         "entityKey":  "updateScheduleType",
         "dataType":  16,
         "booleanActions":  0,
-        "category":  103,
+        "category":  "TableHeaders.settings",
         "options":  [
             {
                 "nameResourceKey":  "SoftwareUpdates.IosUpdatePolicy.Settings.Schedule.outsideActiveHours",
@@ -39,7 +39,7 @@
     },
     {
         "dataType":  16,
-        "category":  103,
+        "category":  "TableHeaders.settings",
         "nameResourceKey":  "timeZoneName",
         "descriptionResourceKey":  "timeZoneDescription",
         "childSettings":  [
@@ -249,6 +249,6 @@
         "entityKey":  "timeWidows",
         "dataType":  20,
         "booleanActions":  0,
-        "category":  103
+        "category":  "TableHeaders.settings"
     }
 ]

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

@@ -11,33 +11,53 @@
         "nameResourceKey":  "EnrollmentStatusScreen.progressToggle",
         "descriptionResourceKey":  "",
         "entityKey":  "showInstallationProgress",
-        "dataType":  0,
+        "dataType":  16,
         "booleanActions":  109,
-        "category":  103
+        "category":  "TableHeaders.settings",
+        "options":  [                                
+            {
+                "nameResourceKey":  "SettingDetails.no",
+                "value":  "false"
             },
+            {
+                "nameResourceKey":  "BooleanActions.yes",
+                "value":  "true",
+                "Children": [
                     {
                         "nameResourceKey":  "EnrollmentStatusScreen.timeout",
                         "descriptionResourceKey":  "",
-        "entityKey":  "installProgressTimeoutInMinutes",
+                        "entityKey":  "InstallProgressTimeout",
                         "dataType":  14,
                         "booleanActions":  0,
-        "category":  103
+                        "category":  "TableHeaders.settings"
                     },
                     {
                         "nameResourceKey":  "EnrollmentStatusScreen.customMessageToggle",
                         "descriptionResourceKey":  "",
                         "entityKey":  "showCustomErrorMessage",
-        "dataType":  0,
+                        "dataType":  16,
                         "booleanActions":  109,
-        "category":  103
+                        "category":  "TableHeaders.settings",
+                        "options":  [                                
+                            {
+                                "nameResourceKey":  "SettingDetails.no",
+                                "value":  "false"
                             },
+                            {
+                                "nameResourceKey":  "BooleanActions.yes",
+                                "value":  "true",
+                                "Children": [
                                     {
                                         "nameResourceKey":  "EnrollmentStatusScreen.customMessageTextBox",
                                         "descriptionResourceKey":  "",
                                         "entityKey":  "customErrorMessage",
                                         "dataType":  20,
                                         "booleanActions":  0,
-        "category":  103
+                                        "category":  "TableHeaders.settings"
+                                    }
+                                ]
+                            }
+                        ]
                     },
                     {
                         "nameResourceKey":  "EnrollmentStatusScreen.collectLogToggle",
@@ -45,7 +65,7 @@
                         "entityKey":  "allowLogCollectionOnInstallFailure",
                         "dataType":  0,
                         "booleanActions":  109,
-        "category":  103
+                        "category":  "TableHeaders.settings"
                     },
                     {
                         "nameResourceKey":  "EnrollmentStatusScreen.enableForAutopilotOnlyToggle",
@@ -53,7 +73,7 @@
                         "entityKey":  "trackInstallProgressForAutopilotOnly",
                         "dataType":  0,
                         "booleanActions":  109,
-        "category":  103
+                        "category":  "TableHeaders.settings"
                     },
                     {
                         "nameResourceKey":  "EnrollmentStatusScreen.blockToggle",
@@ -61,7 +81,7 @@
                         "entityKey":  "blockDeviceSetupRetryByUser",
                         "dataType":  16,
                         "booleanActions":  0,
-        "category":  103,
+                        "category":  "TableHeaders.settings",
                         "options":  [                                
                             {
                                 "nameResourceKey":  "SettingDetails.no",
@@ -77,7 +97,7 @@
                                         "entityKey":  "allowDeviceResetOnInstallFailure",
                                         "dataType":  0,
                                         "booleanActions":  109,
-                        "category":  103
+                                        "category":  "TableHeaders.settings"
                                     },
                                     {
                                         "nameResourceKey":  "EnrollmentStatusScreen.allowToUseToggle",
@@ -85,7 +105,7 @@
                                         "entityKey":  "allowDeviceUseOnInstallFailure",
                                         "dataType":  0,
                                         "booleanActions":  109,
-                        "category":  103
+                                        "category":  "TableHeaders.settings"
                                     },
                                     {
                                         "nameResourceKey":  "EnrollmentStatusScreen.Apps.useSelectedAppsToggleLabel",
@@ -93,7 +113,21 @@
                                         "entityKey":  "waitForApps",
                                         "dataType":  14,
                                         "booleanActions":  0,
-                        "category":  103
+                                        "category":  "TableHeaders.settings",
+                                        "Children": [
+                                            {
+                                                "nameResourceKey":  "EnrollmentStatusScreen.Apps.allowNonBlockingAppInstallation",
+                                                "descriptionResourceKey":  "",
+                                                "entityKey":  "allowNonBlockingAppInstallation",
+                                                "dataType":  0,
+                                                "booleanActions":  109,
+                                                "category":  "TableHeaders.settings"
+                                            }
+                                        ] 
+                                    }
+                                ]
+                            }
+                        ]        
                     }
                 ]
             }

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

@@ -0,0 +1,69 @@
+[
+    {
+        "nameResourceKey":  "TableHeaders.policyType",
+        "descriptionResourceKey":  "",
+        "entityKey":  "WindowsDriverUpdateProfile.Subtitle.automatic",
+        "dataType":  200,
+        "booleanActions":  0,
+        "category": 1000,
+        "Condition": {
+            "Expressions": [
+                {
+                    "property": "approvalType",
+                    "value": "automatic"
+                }
+            ]
+        }
+    },
+    {
+        "nameResourceKey":  "TableHeaders.policyType",
+        "descriptionResourceKey":  "",
+        "entityKey":  "WindowsDriverUpdateProfile.Subtitle.manual",
+        "dataType":  200,
+        "booleanActions":  0,
+        "category": 1000,
+        "Condition": {
+            "Expressions": [
+                {
+                    "property": "approvalType",
+                    "value": "manual"
+                }
+            ]
+        }        
+    },
+    {
+        "nameResourceKey":  "WindowsDriverUpdateProfile.Details.ApprovalMethod.label",
+        "descriptionResourceKey":  "",
+        "entityKey":  "approvalType",
+        "dataType":  16,
+        "booleanActions":  0,
+        "category":  "TableHeaders.settings",
+        "options":  [                                
+            {
+                "nameResourceKey":  "WindowsDriverUpdateProfile.ApprovalMethod.automatic",
+                "value":  "automatic"
+            },
+            {
+                "nameResourceKey":  "WindowsDriverUpdateProfile.ApprovalMethod.manual",
+                "value":  "manual"
+            }
+        ]
+    },
+    {
+        "nameResourceKey":  "WindowsDriverUpdateProfile.Details.DeploymentDeferralInDays.label",
+        "descriptionResourceKey":  "",
+        "entityKey":  "deploymentDeferralInDays",
+        "formatStringKey": "WindowsDriverUpdateProfile.Details.DeploymentDeferralInDays.value",
+        "dataType":  108,
+        "booleanActions":  0,
+        "category":  "TableHeaders.settings",
+        "Condition": {
+            "Expressions": [
+                {
+                    "property": "approvalType",
+                    "value": "automatic"
+                }
+            ]
+        }
+    }
+]

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

@@ -14,5 +14,94 @@
         "dataType":  20,
         "booleanActions":  0,
         "category":  "WindowsFeatureUpdateProfile.Details.deploymentSettingsTitle"
+    },
+    {
+        "nameResourceKey":  "WindowsFeatureUpdateProfile.Details.OptionalUpdate.label",
+        "descriptionResourceKey":  "",
+        "entityKey":  "installFeatureUpdatesOptional",
+        "dataType":  16,
+        "booleanActions":  0,
+        "category": "WindowsFeatureUpdateProfile.Details.deploymentSettingsTitle",
+        "options":  [
+            {
+                "nameResourceKey":  "OptionalFeatureUpdateOptions.required",
+                "descriptionResourceKey":  "",
+                "value":  false
+            },
+            {
+                "nameResourceKey":  "OptionalFeatureUpdateOptions.optional",
+                "descriptionResourceKey":  "",
+                "value":  true
+            }
+        ]
+    },
+    {
+        "nameResourceKey":  "WindowsFeatureUpdateProfile.Details.Windows11SideBySideInstall.label",
+        "descriptionResourceKey":  "",
+        "entityKey":  "installLatestWindows10OnWindows11IneligibleDevice",
+        "dataType":  0,
+        "booleanActions":  109,
+        "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/#microsoft.graph.windowsQualityUpdateProfile.json

@@ -13,7 +13,7 @@
         "entityKey":  "deployableContentDisplayName",
         "dataType":  20,
         "booleanActions":  0,
-        "category":  103
+        "category":  "TableHeaders.settings"
     },
     {
         "nameResourceKey":  "WindowsQualityUpdateProfile.Details.DaysUntilForcedReboot.label",
@@ -21,13 +21,13 @@
         "entityKey":  "expeditedUpdateSettings",
         "dataType":  6,
         "booleanActions":  0,
-        "category":  103,
+        "category":  "TableHeaders.settings",
         "complexOptions":  [
             {
                 "nameResourceKey":  "WindowsQualityUpdateProfile.Details.DaysUntilForcedReboot.label",
                 "descriptionResourceKey":  "",
                 "dataType":  16,
-                "category":  103,
+                "category":  "TableHeaders.settings",
                 "entityKey":  "daysUntilForcedReboot",
                 "booleanActions":  0,
                 "options":  [                                

Documentation/ObjectInfo/airprint_iosdevicefeatures.json

@@ -1,4 +1,4 @@
-{
+{
     "airprint_iosdevicefeatures":  [
                                        {
                                            "isSettingDescription":  false,
@@ -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

@@ -1,4 +1,4 @@
-{
+{
     "airprint_macdevicefeatures":  [
                                        {
                                            "isSettingDescription":  false,
@@ -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

@@ -1,14 +1,14 @@
-{
+{
     "androiddefenderatp_complianceandroid":  {
                                                  "isSettingDescription":  false,
                                                  "showAsSectionHeader":  false,
                                                  "dataType":  8,
-                                                 "category":  137,
+                                                 "category":  146,
                                                  "nameResourceKey":  "complianceAtpDeviceRiskHeader",
                                                  "childSettings":  [
                                                                        {
                                                                            "dataType":  16,
-                                                                           "category":  137,
+                                                                           "category":  146,
                                                                            "nameResourceKey":  "complianceDeviceRiskATPRequirementName",
                                                                            "descriptionResourceKey":  "complianceDeviceRiskATPRequirementDescription",
                                                                            "childSettings":  [

Documentation/ObjectInfo/androiddefenderatp_complianceandroiddeviceowner.json

@@ -1,14 +1,14 @@
-{
+{
     "androiddefenderatp_complianceandroiddeviceowner":  {
                                                             "isSettingDescription":  false,
                                                             "showAsSectionHeader":  false,
                                                             "dataType":  8,
-                                                            "category":  137,
+                                                            "category":  146,
                                                             "nameResourceKey":  "complianceAtpDeviceRiskHeader",
                                                             "childSettings":  [
                                                                                   {
                                                                                       "dataType":  16,
-                                                                                      "category":  137,
+                                                                                      "category":  146,
                                                                                       "nameResourceKey":  "complianceDeviceRiskATPRequirementName",
                                                                                       "descriptionResourceKey":  "complianceDeviceRiskATPRequirementDescription",
                                                                                       "childSettings":  [

Documentation/ObjectInfo/androiddefenderatp_complianceandroidforwork.json

@@ -1,14 +1,14 @@
-{
+{
     "androiddefenderatp_complianceandroidforwork":  {
                                                         "isSettingDescription":  false,
                                                         "showAsSectionHeader":  false,
                                                         "dataType":  8,
-                                                        "category":  137,
+                                                        "category":  146,
                                                         "nameResourceKey":  "complianceAtpDeviceRiskHeader",
                                                         "childSettings":  [
                                                                               {
                                                                                   "dataType":  16,
-                                                                                  "category":  137,
+                                                                                  "category":  146,
                                                                                   "nameResourceKey":  "complianceDeviceRiskATPRequirementName",
                                                                                   "descriptionResourceKey":  "complianceDeviceRiskATPRequirementDescription",
                                                                                   "childSettings":  [

Documentation/ObjectInfo/androiddeviceownerapplications_androiddeviceownergeneral.json

@@ -1,4 +1,4 @@
-{
+{
     "androiddeviceownerapplications_androiddeviceownergeneral":  [
                                                                      {
                                                                          "isSettingDescription":  false,
@@ -85,7 +85,7 @@
                                                                                                    "enabled":  true
                                                                                                },
                                                                                                {
-                                                                                                   "dataType":  0,
+                                                                                                   "dataType":  16,
                                                                                                    "category":  2,
                                                                                                    "nameResourceKey":  "publicPlayStoreEnabledName",
                                                                                                    "descriptionResourceKey":  "publicPlayStoreEnabledDescription",
@@ -93,13 +93,200 @@
 
                                                                                                                      ],
                                                                                                    "options":  [
-
+                                                                                                                   {
+                                                                                                                       "nameResourceKey":  "publicPlayStoreSelectionNotConfigured",
+                                                                                                                       "value":  "notConfigured",
+                                                                                                                       "enabled":  true
+                                                                                                                   },
+                                                                                                                   {
+                                                                                                                       "nameResourceKey":  "publicPlayStoreSelectionAllowList",
+                                                                                                                       "value":  "allowList",
+                                                                                                                       "enabled":  true
+                                                                                                                   },
+                                                                                                                   {
+                                                                                                                       "nameResourceKey":  "publicPlayStoreSelectionBlockList",
+                                                                                                                       "value":  "blockList",
+                                                                                                                       "enabled":  true
+                                                                                                                   }
                                                                                                                ],
-                                                                                                   "entityKey":  "publicPlayStoreEnabled",
+                                                                                                   "entityKey":  "playStoreMode",
                                                                                                    "booleanActions":  0,
-                                                                                                   "defaultValue":  false,
+                                                                                                   "defaultValue":  "notConfigured",
+                                                                                                   "unconfiguredValue":  "notConfigured",
                                                                                                    "policyType":  2,
                                                                                                    "enabled":  true
+                                                                                               },
+                                                                                               {
+                                                                                                   "dataType":  10,
+                                                                                                   "category":  2,
+                                                                                                   "nameResourceKey":  "publicPlayStoreEnabledWarning",
+                                                                                                   "childSettings":  [
+
+                                                                                                                     ],
+                                                                                                   "options":  [
+
+                                                                                                               ],
+                                                                                                   "booleanActions":  0,
+                                                                                                   "policyType":  2,
+                                                                                                   "enabled":  true
+                                                                                               },
+                                                                                               {
+                                                                                                   "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":  "certificateInstallTitle",
+                                                                                                   "descriptionResourceKey":  "certificateInstallDescription",
+                                                                                                   "childSettings":  [
+
+                                                                                                                     ],
+                                                                                                   "options":  [
+
+                                                                                                               ],
+                                                                                                   "entityKey":  "certInstallApps",
+                                                                                                   "booleanActions":  0,
+                                                                                                   "policyType":  2,
+                                                                                                   "enabled":  false
+                                                                                               },
+                                                                                               {
+                                                                                                   "complexOptions":  [
+                                                                                                                          {
+                                                                                                                              "dataType":  11,
+                                                                                                                              "category":  2,
+                                                                                                                              "nameResourceKey":  "selectSecurityApp",
+                                                                                                                              "descriptionResourceKey":  "empty",
+                                                                                                                              "childSettings":  [
+
+                                                                                                                                                ],
+                                                                                                                              "options":  [
+
+                                                                                                                                          ],
+                                                                                                                              "entityKey":  "securityLogAppId",
+                                                                                                                              "booleanActions":  0,
+                                                                                                                              "policyType":  2,
+                                                                                                                              "enabled":  true
+                                                                                                                          }
+                                                                                                                      ],
+                                                                                                   "dataType":  5,
+                                                                                                   "category":  2,
+                                                                                                   "nameResourceKey":  "securityLogsTitle",
+                                                                                                   "emptyValueResourceKey":  "selectSecurityApp",
+                                                                                                   "childSettings":  [
+
+                                                                                                                     ],
+                                                                                                   "options":  [
+
+                                                                                                               ],
+                                                                                                   "entityKey":  "securityLogApp",
+                                                                                                   "booleanActions":  0,
+                                                                                                   "policyType":  2,
+                                                                                                   "enabled":  false
+                                                                                               },
+                                                                                               {
+                                                                                                   "complexOptions":  [
+                                                                                                                          {
+                                                                                                                              "dataType":  11,
+                                                                                                                              "category":  2,
+                                                                                                                              "nameResourceKey":  "selectNetworkApp",
+                                                                                                                              "descriptionResourceKey":  "empty",
+                                                                                                                              "childSettings":  [
+
+                                                                                                                                                ],
+                                                                                                                              "options":  [
+
+                                                                                                                                          ],
+                                                                                                                              "entityKey":  "networkLogAppId",
+                                                                                                                              "booleanActions":  0,
+                                                                                                                              "policyType":  2,
+                                                                                                                              "enabled":  true
+                                                                                                                          }
+                                                                                                                      ],
+                                                                                                   "dataType":  5,
+                                                                                                   "category":  2,
+                                                                                                   "nameResourceKey":  "networkLogsTitle",
+                                                                                                   "emptyValueResourceKey":  "selectNetworkApp",
+                                                                                                   "childSettings":  [
+
+                                                                                                                     ],
+                                                                                                   "options":  [
+
+                                                                                                               ],
+                                                                                                   "entityKey":  "networkLogApp",
+                                                                                                   "booleanActions":  0,
+                                                                                                   "policyType":  2,
+                                                                                                   "enabled":  false
                                                                                                }
                                                                                            ],
                                                                          "options":  [
@@ -108,6 +295,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/androiddeviceownerpolicymessages_androiddeviceownergeneral.json

@@ -1,116 +1,102 @@
-{
-    "vpnconditionalaccess_windows10vpn":  {
-                                              "dataType":  19,
-                                              "category":  125,
-                                              "nameResourceKey":  "enableConditionalAccessName",
-                                              "descriptionResourceKey":  "enableConditionalAccessDescription",
+{
+    "androiddeviceownerpolicymessages_androiddeviceownergeneral":  {
+                                                                       "isSettingDescription":  false,
+                                                                       "showAsSectionHeader":  true,
+                                                                       "dataType":  8,
+                                                                       "category":  3,
+                                                                       "nameResourceKey":  "allAndroidCorpEnrollmentTypesHeaderName",
+                                                                       "descriptionResourceKey":  "allAndroidCorpEnrollmentTypesHeaderDescription",
                                                                        "childSettings":  [
                                                                                              {
-                                                                        "dataType":  19,
-                                                                        "category":  125,
-                                                                        "nameResourceKey":  "enableSingleSignOnName",
-                                                                        "descriptionResourceKey":  "enableSingleSignOnDescription",
+                                                                                                 "isSettingDescription":  false,
+                                                                                                 "showAsSectionHeader":  true,
+                                                                                                 "dataType":  8,
+                                                                                                 "category":  3,
+                                                                                                 "nameResourceKey":  "shortSupportMessageName",
                                                                                                  "childSettings":  [
                                                                                                                        {
-                                                                                                  "complexOptions":  [
-                                                                                                                         {
-                                                                                                                             "dataType":  20,
-                                                                                                                             "category":  125,
-                                                                                                                             "nameResourceKey":  "eDPPolicyAppsListNameName",
-                                                                                                                             "descriptionResourceKey":  "eDPPolicyAppsListNameDescription",
+                                                                                                                           "dataType":  25,
+                                                                                                                           "category":  3,
                                                                                                                            "childSettings":  [
 
                                                                                                                                              ],
                                                                                                                            "options":  [
 
                                                                                                                                        ],
-                                                                                                                             "entityKey":  "name",
                                                                                                                            "booleanActions":  0,
-                                                                                                                             "policyType":  88,
+                                                                                                                           "policyType":  2,
+                                                                                                                           "enabled":  true
+                                                                                                                       }
+                                                                                                                   ],
+                                                                                                 "options":  [
+
+                                                                                                             ],
+                                                                                                 "booleanActions":  0,
+                                                                                                 "policyType":  2,
                                                                                                  "enabled":  true
                                                                                              },
                                                                                              {
-                                                                                                                             "dataType":  20,
-                                                                                                                             "category":  125,
-                                                                                                                             "nameResourceKey":  "sCEPPolicyObjectIdentifierColumnName",
-                                                                                                                             "descriptionResourceKey":  "sCEPPolicyObjectIdentifierColumnDescription",
+                                                                                                 "isSettingDescription":  false,
+                                                                                                 "showAsSectionHeader":  true,
+                                                                                                 "dataType":  8,
+                                                                                                 "category":  3,
+                                                                                                 "nameResourceKey":  "longSupportMessageName",
+                                                                                                 "childSettings":  [
+                                                                                                                       {
+                                                                                                                           "dataType":  25,
+                                                                                                                           "category":  3,
                                                                                                                            "childSettings":  [
 
                                                                                                                                              ],
                                                                                                                            "options":  [
 
                                                                                                                                        ],
-                                                                                                                             "entityKey":  "objectIdentifier",
                                                                                                                            "booleanActions":  0,
-                                                                                                                             "policyType":  88,
+                                                                                                                           "policyType":  2,
                                                                                                                            "enabled":  true
                                                                                                                        }
                                                                                                                    ],
-                                                                                                  "dataType":  6,
-                                                                                                  "category":  125,
-                                                                                                  "nameResourceKey":  "sCEPPolicyExtendedKeyUsageName",
-                                                                                                  "descriptionResourceKey":  "empty",
+                                                                                                 "options":  [
+
+                                                                                                             ],
+                                                                                                 "booleanActions":  0,
+                                                                                                 "policyType":  2,
+                                                                                                 "enabled":  true
+                                                                                             },
+                                                                                             {
+                                                                                                 "isSettingDescription":  false,
+                                                                                                 "showAsSectionHeader":  true,
+                                                                                                 "dataType":  8,
+                                                                                                 "category":  3,
+                                                                                                 "nameResourceKey":  "lockScreenMessageName",
+                                                                                                 "childSettings":  [
+                                                                                                                       {
+                                                                                                                           "dataType":  25,
+                                                                                                                           "category":  3,
                                                                                                                            "childSettings":  [
 
                                                                                                                                              ],
                                                                                                                            "options":  [
 
                                                                                                                                        ],
-                                                                                                  "entityKey":  "singleSignOnEku",
                                                                                                                            "booleanActions":  0,
-                                                                                                  "policyType":  88,
+                                                                                                                           "policyType":  2,
                                                                                                                            "enabled":  true
-                                                                                              },
-                                                                                              {
-                                                                                                  "dataType":  20,
-                                                                                                  "category":  125,
-                                                                                                  "nameResourceKey":  "issuerHashName",
-                                                                                                  "descriptionResourceKey":  "issuerHashDescription",
-                                                                                                  "childSettings":  [
-
+                                                                                                                       }
                                                                                                                    ],
                                                                                                  "options":  [
 
                                                                                                              ],
-                                                                                                  "entityKey":  "singleSignOnIssuerHash",
                                                                                                  "booleanActions":  0,
-                                                                                                  "policyType":  88,
+                                                                                                 "policyType":  2,
                                                                                                  "enabled":  true
                                                                                              }
                                                                                          ],
                                                                        "options":  [
-                                                                                        {
-                                                                                            "nameResourceKey":  "enableOption",
-                                                                                            "value":  true,
-                                                                                            "enabled":  true
-                                                                                        },
-                                                                                        {
-                                                                                            "nameResourceKey":  "disableOption",
-                                                                                            "value":  false,
-                                                                                            "enabled":  true
-                                                                                        }
+
                                                                                    ],
-                                                                        "entityKey":  "enableSingleSignOnWithAlternateCertificate",
                                                                        "booleanActions":  0,
-                                                                        "policyType":  88,
-                                                                        "enabled":  true
-                                                                    }
-                                                                ],
-                                              "options":  [
-                                                              {
-                                                                  "nameResourceKey":  "enableOption",
-                                                                  "value":  true,
-                                                                  "enabled":  true
-                                                              },
-                                                              {
-                                                                  "nameResourceKey":  "disableOption",
-                                                                  "value":  false,
-                                                                  "enabled":  true
-                                                              }
-                                                          ],
-                                              "entityKey":  "enableConditionalAccess",
-                                              "booleanActions":  0,
-                                              "policyType":  88,
+                                                                       "policyType":  2,
                                                                        "enabled":  true
                                                                    }
 }

Documentation/ObjectInfo/applicationguard_windows10endpointprotection.json

@@ -1,8 +1,8 @@
-{
+{
     "applicationguard_windows10endpointprotection":  [
                                                          {
                                                              "dataType":  10,
-                                                             "category":  3,
+                                                             "category":  4,
                                                              "nameResourceKey":  "applicationGuardInstallationText",
                                                              "childSettings":  [
 
@@ -11,18 +11,18 @@
 
                                                                          ],
                                                              "booleanActions":  0,
-                                                             "policyType":  76,
+                                                             "policyType":  77,
                                                              "enabled":  true
                                                          },
                                                          {
                                                              "dataType":  0,
-                                                             "category":  3,
+                                                             "category":  4,
                                                              "nameResourceKey":  "applicationGuardEnabledName",
                                                              "descriptionResourceKey":  "applicationGuardEnabledDescription",
                                                              "childSettings":  [
                                                                                    {
                                                                                        "dataType":  16,
-                                                                                       "category":  3,
+                                                                                       "category":  4,
                                                                                        "nameResourceKey":  "applicationGuardClipboardBehaviorName",
                                                                                        "descriptionResourceKey":  "applicationGuardClipboardBehaviorDescription",
                                                                                        "childSettings":  [
@@ -40,7 +40,7 @@
                                                                                                            "children":  [
                                                                                                                             {
                                                                                                                                 "dataType":  16,
-                                                                                                                                "category":  3,
+                                                                                                                                "category":  4,
                                                                                                                                 "nameResourceKey":  "applicationGuardClipboardContentName",
                                                                                                                                 "descriptionResourceKey":  "applicationGuardClipboardContentDescription",
                                                                                                                                 "childSettings":  [
@@ -72,7 +72,7 @@
                                                                                                                                 "booleanActions":  0,
                                                                                                                                 "defaultValue":  "notConfigured",
                                                                                                                                 "unconfiguredValue":  "notConfigured",
-                                                                                                                                "policyType":  76,
+                                                                                                                                "policyType":  77,
                                                                                                                                 "enabled":  true
                                                                                                                             }
                                                                                                                         ],
@@ -84,7 +84,7 @@
                                                                                                            "children":  [
                                                                                                                             {
                                                                                                                                 "dataType":  16,
-                                                                                                                                "category":  3,
+                                                                                                                                "category":  4,
                                                                                                                                 "nameResourceKey":  "applicationGuardClipboardContentName",
                                                                                                                                 "descriptionResourceKey":  "applicationGuardClipboardContentDescription",
                                                                                                                                 "childSettings":  [
@@ -116,7 +116,7 @@
                                                                                                                                 "booleanActions":  0,
                                                                                                                                 "defaultValue":  "notConfigured",
                                                                                                                                 "unconfiguredValue":  "notConfigured",
-                                                                                                                                "policyType":  76,
+                                                                                                                                "policyType":  77,
                                                                                                                                 "enabled":  true
                                                                                                                             }
                                                                                                                         ],
@@ -128,7 +128,7 @@
                                                                                                            "children":  [
                                                                                                                             {
                                                                                                                                 "dataType":  16,
-                                                                                                                                "category":  3,
+                                                                                                                                "category":  4,
                                                                                                                                 "nameResourceKey":  "applicationGuardClipboardContentName",
                                                                                                                                 "descriptionResourceKey":  "applicationGuardClipboardContentDescription",
                                                                                                                                 "childSettings":  [
@@ -160,7 +160,7 @@
                                                                                                                                 "booleanActions":  0,
                                                                                                                                 "defaultValue":  "notConfigured",
                                                                                                                                 "unconfiguredValue":  "notConfigured",
-                                                                                                                                "policyType":  76,
+                                                                                                                                "policyType":  77,
                                                                                                                                 "enabled":  true
                                                                                                                             }
                                                                                                                         ],
@@ -176,12 +176,12 @@
                                                                                        "booleanActions":  0,
                                                                                        "defaultValue":  "notConfigured",
                                                                                        "unconfiguredValue":  "notConfigured",
-                                                                                       "policyType":  76,
+                                                                                       "policyType":  77,
                                                                                        "enabled":  true
                                                                                    },
                                                                                    {
                                                                                        "dataType":  0,
-                                                                                       "category":  3,
+                                                                                       "category":  4,
                                                                                        "nameResourceKey":  "applicationGuardBlockNonEnterpriseContentName",
                                                                                        "descriptionResourceKey":  "applicationGuardBlockNonEnterpriseContentDescription",
                                                                                        "childSettings":  [
@@ -194,18 +194,18 @@
                                                                                        "booleanActions":  3,
                                                                                        "defaultValue":  false,
                                                                                        "unconfiguredValue":  false,
-                                                                                       "policyType":  76,
+                                                                                       "policyType":  77,
                                                                                        "enabled":  true
                                                                                    },
                                                                                    {
                                                                                        "dataType":  0,
-                                                                                       "category":  3,
+                                                                                       "category":  4,
                                                                                        "nameResourceKey":  "applicationGuardPrintFromVirtualBrowserName",
                                                                                        "descriptionResourceKey":  "applicationGuardPrintFromVirtualBrowserDescription",
                                                                                        "childSettings":  [
                                                                                                              {
                                                                                                                  "dataType":  13,
-                                                                                                                 "category":  3,
+                                                                                                                 "category":  4,
                                                                                                                  "nameResourceKey":  "applicationGuardAllowPrintToName",
                                                                                                                  "descriptionResourceKey":  "applicationGuardAllowPrintToDescription",
                                                                                                                  "emptyValueResourceKey":  "notConfigured",
@@ -236,7 +236,7 @@
                                                                                                                              ],
                                                                                                                  "entityKey":  "applicationGuardPrintSettings",
                                                                                                                  "booleanActions":  0,
-                                                                                                                 "policyType":  76,
+                                                                                                                 "policyType":  77,
                                                                                                                  "enabled":  true
                                                                                                              }
                                                                                                          ],
@@ -247,12 +247,12 @@
                                                                                        "booleanActions":  0,
                                                                                        "defaultValue":  false,
                                                                                        "unconfiguredValue":  false,
-                                                                                       "policyType":  76,
+                                                                                       "policyType":  77,
                                                                                        "enabled":  true
                                                                                    },
                                                                                    {
                                                                                        "dataType":  0,
-                                                                                       "category":  3,
+                                                                                       "category":  4,
                                                                                        "nameResourceKey":  "applicationGuardAuditingName",
                                                                                        "descriptionResourceKey":  "applicationGuardAuditingDescription",
                                                                                        "childSettings":  [
@@ -265,12 +265,12 @@
                                                                                        "booleanActions":  0,
                                                                                        "defaultValue":  false,
                                                                                        "unconfiguredValue":  false,
-                                                                                       "policyType":  76,
+                                                                                       "policyType":  77,
                                                                                        "enabled":  true
                                                                                    },
                                                                                    {
                                                                                        "dataType":  0,
-                                                                                       "category":  3,
+                                                                                       "category":  4,
                                                                                        "nameResourceKey":  "applicationGuardAllowPersistenceName",
                                                                                        "descriptionResourceKey":  "applicationGuardAllowPersistenceDescription",
                                                                                        "childSettings":  [
@@ -283,12 +283,12 @@
                                                                                        "booleanActions":  0,
                                                                                        "defaultValue":  false,
                                                                                        "unconfiguredValue":  false,
-                                                                                       "policyType":  76,
+                                                                                       "policyType":  77,
                                                                                        "enabled":  true
                                                                                    },
                                                                                    {
                                                                                        "dataType":  0,
-                                                                                       "category":  3,
+                                                                                       "category":  4,
                                                                                        "nameResourceKey":  "applicationGuardAllowVirtualGPUName",
                                                                                        "descriptionResourceKey":  "applicationGuardAllowVirtualGPUDescription",
                                                                                        "childSettings":  [
@@ -301,12 +301,12 @@
                                                                                        "booleanActions":  2,
                                                                                        "defaultValue":  false,
                                                                                        "unconfiguredValue":  false,
-                                                                                       "policyType":  76,
+                                                                                       "policyType":  77,
                                                                                        "enabled":  true
                                                                                    },
                                                                                    {
                                                                                        "dataType":  0,
-                                                                                       "category":  3,
+                                                                                       "category":  4,
                                                                                        "nameResourceKey":  "applicationGuardAllowFileSaveOnHostName",
                                                                                        "descriptionResourceKey":  "applicationGuardAllowFileSaveOnHostDescription",
                                                                                        "childSettings":  [
@@ -319,7 +319,7 @@
                                                                                        "booleanActions":  2,
                                                                                        "defaultValue":  false,
                                                                                        "unconfiguredValue":  false,
-                                                                                       "policyType":  76,
+                                                                                       "policyType":  77,
                                                                                        "enabled":  true
                                                                                    }
                                                                                ],
@@ -330,18 +330,18 @@
                                                              "booleanActions":  2,
                                                              "defaultValue":  false,
                                                              "unconfiguredValue":  false,
-                                                             "policyType":  76,
+                                                             "policyType":  77,
                                                              "enabled":  false
                                                          },
                                                          {
                                                              "dataType":  16,
-                                                             "category":  3,
+                                                             "category":  4,
                                                              "nameResourceKey":  "applicationGuardEnabledName",
                                                              "descriptionResourceKey":  "applicationGuardEnabledOptionsDescription",
                                                              "childSettings":  [
                                                                                    {
                                                                                        "dataType":  16,
-                                                                                       "category":  3,
+                                                                                       "category":  4,
                                                                                        "nameResourceKey":  "applicationGuardClipboardBehaviorName",
                                                                                        "descriptionResourceKey":  "applicationGuardClipboardBehaviorDescription",
                                                                                        "childSettings":  [
@@ -359,7 +359,7 @@
                                                                                                            "children":  [
                                                                                                                             {
                                                                                                                                 "dataType":  16,
-                                                                                                                                "category":  3,
+                                                                                                                                "category":  4,
                                                                                                                                 "nameResourceKey":  "applicationGuardClipboardContentName",
                                                                                                                                 "descriptionResourceKey":  "applicationGuardClipboardContentDescription",
                                                                                                                                 "childSettings":  [
@@ -391,7 +391,7 @@
                                                                                                                                 "booleanActions":  0,
                                                                                                                                 "defaultValue":  "notConfigured",
                                                                                                                                 "unconfiguredValue":  "notConfigured",
-                                                                                                                                "policyType":  76,
+                                                                                                                                "policyType":  77,
                                                                                                                                 "enabled":  true
                                                                                                                             }
                                                                                                                         ],
@@ -403,7 +403,7 @@
                                                                                                            "children":  [
                                                                                                                             {
                                                                                                                                 "dataType":  16,
-                                                                                                                                "category":  3,
+                                                                                                                                "category":  4,
                                                                                                                                 "nameResourceKey":  "applicationGuardClipboardContentName",
                                                                                                                                 "descriptionResourceKey":  "applicationGuardClipboardContentDescription",
                                                                                                                                 "childSettings":  [
@@ -435,7 +435,7 @@
                                                                                                                                 "booleanActions":  0,
                                                                                                                                 "defaultValue":  "notConfigured",
                                                                                                                                 "unconfiguredValue":  "notConfigured",
-                                                                                                                                "policyType":  76,
+                                                                                                                                "policyType":  77,
                                                                                                                                 "enabled":  true
                                                                                                                             }
                                                                                                                         ],
@@ -447,7 +447,7 @@
                                                                                                            "children":  [
                                                                                                                             {
                                                                                                                                 "dataType":  16,
-                                                                                                                                "category":  3,
+                                                                                                                                "category":  4,
                                                                                                                                 "nameResourceKey":  "applicationGuardClipboardContentName",
                                                                                                                                 "descriptionResourceKey":  "applicationGuardClipboardContentDescription",
                                                                                                                                 "childSettings":  [
@@ -479,7 +479,7 @@
                                                                                                                                 "booleanActions":  0,
                                                                                                                                 "defaultValue":  "notConfigured",
                                                                                                                                 "unconfiguredValue":  "notConfigured",
-                                                                                                                                "policyType":  76,
+                                                                                                                                "policyType":  77,
                                                                                                                                 "enabled":  true
                                                                                                                             }
                                                                                                                         ],
@@ -495,12 +495,12 @@
                                                                                        "booleanActions":  0,
                                                                                        "defaultValue":  "notConfigured",
                                                                                        "unconfiguredValue":  "notConfigured",
-                                                                                       "policyType":  76,
+                                                                                       "policyType":  77,
                                                                                        "enabled":  true
                                                                                    },
                                                                                    {
                                                                                        "dataType":  0,
-                                                                                       "category":  3,
+                                                                                       "category":  4,
                                                                                        "nameResourceKey":  "applicationGuardBlockNonEnterpriseContentName",
                                                                                        "descriptionResourceKey":  "applicationGuardBlockNonEnterpriseContentDescription",
                                                                                        "childSettings":  [
@@ -513,18 +513,18 @@
                                                                                        "booleanActions":  3,
                                                                                        "defaultValue":  false,
                                                                                        "unconfiguredValue":  false,
-                                                                                       "policyType":  76,
+                                                                                       "policyType":  77,
                                                                                        "enabled":  true
                                                                                    },
                                                                                    {
                                                                                        "dataType":  0,
-                                                                                       "category":  3,
+                                                                                       "category":  4,
                                                                                        "nameResourceKey":  "applicationGuardPrintFromVirtualBrowserName",
                                                                                        "descriptionResourceKey":  "applicationGuardPrintFromVirtualBrowserDescription",
                                                                                        "childSettings":  [
                                                                                                              {
                                                                                                                  "dataType":  13,
-                                                                                                                 "category":  3,
+                                                                                                                 "category":  4,
                                                                                                                  "nameResourceKey":  "applicationGuardAllowPrintToName",
                                                                                                                  "descriptionResourceKey":  "applicationGuardAllowPrintToDescription",
                                                                                                                  "emptyValueResourceKey":  "notConfigured",
@@ -555,7 +555,7 @@
                                                                                                                              ],
                                                                                                                  "entityKey":  "applicationGuardPrintSettings",
                                                                                                                  "booleanActions":  0,
-                                                                                                                 "policyType":  76,
+                                                                                                                 "policyType":  77,
                                                                                                                  "enabled":  true
                                                                                                              }
                                                                                                          ],
@@ -566,12 +566,12 @@
                                                                                        "booleanActions":  0,
                                                                                        "defaultValue":  false,
                                                                                        "unconfiguredValue":  false,
-                                                                                       "policyType":  76,
+                                                                                       "policyType":  77,
                                                                                        "enabled":  true
                                                                                    },
                                                                                    {
                                                                                        "dataType":  0,
-                                                                                       "category":  3,
+                                                                                       "category":  4,
                                                                                        "nameResourceKey":  "applicationGuardAuditingName",
                                                                                        "descriptionResourceKey":  "applicationGuardAuditingDescription",
                                                                                        "childSettings":  [
@@ -584,12 +584,12 @@
                                                                                        "booleanActions":  0,
                                                                                        "defaultValue":  false,
                                                                                        "unconfiguredValue":  false,
-                                                                                       "policyType":  76,
+                                                                                       "policyType":  77,
                                                                                        "enabled":  true
                                                                                    },
                                                                                    {
                                                                                        "dataType":  0,
-                                                                                       "category":  3,
+                                                                                       "category":  4,
                                                                                        "nameResourceKey":  "applicationGuardAllowPersistenceName",
                                                                                        "descriptionResourceKey":  "applicationGuardAllowPersistenceDescription",
                                                                                        "childSettings":  [
@@ -602,12 +602,12 @@
                                                                                        "booleanActions":  0,
                                                                                        "defaultValue":  false,
                                                                                        "unconfiguredValue":  false,
-                                                                                       "policyType":  76,
+                                                                                       "policyType":  77,
                                                                                        "enabled":  true
                                                                                    },
                                                                                    {
                                                                                        "dataType":  0,
-                                                                                       "category":  3,
+                                                                                       "category":  4,
                                                                                        "nameResourceKey":  "applicationGuardAllowVirtualGPUName",
                                                                                        "descriptionResourceKey":  "applicationGuardAllowVirtualGPUDescription",
                                                                                        "childSettings":  [
@@ -620,12 +620,12 @@
                                                                                        "booleanActions":  2,
                                                                                        "defaultValue":  false,
                                                                                        "unconfiguredValue":  false,
-                                                                                       "policyType":  76,
+                                                                                       "policyType":  77,
                                                                                        "enabled":  true
                                                                                    },
                                                                                    {
                                                                                        "dataType":  0,
-                                                                                       "category":  3,
+                                                                                       "category":  4,
                                                                                        "nameResourceKey":  "applicationGuardAllowFileSaveOnHostName",
                                                                                        "descriptionResourceKey":  "applicationGuardAllowFileSaveOnHostDescription",
                                                                                        "childSettings":  [
@@ -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_androidgeneral.json

@@ -1,7 +1,7 @@
-{
+{
     "applicationrestrictions_androidgeneral":  {
                                                    "dataType":  16,
-                                                   "category":  4,
+                                                   "category":  5,
                                                    "nameResourceKey":  "restrictedAppsListOptionsName",
                                                    "descriptionResourceKey":  "restrictedAppsListOptionsDescription",
                                                    "childSettings":  [
@@ -10,7 +10,7 @@
                                                                                              {
                                                                                                  "metadata":  {
                                                                                                                   "dataType":  20,
-                                                                                                                  "category":  4,
+                                                                                                                  "category":  5,
                                                                                                                   "nameResourceKey":  "appUrlName",
                                                                                                                   "descriptionResourceKey":  "empty",
                                                                                                                   "emptyValueResourceKey":  "androidAppStoreExample",
@@ -29,7 +29,7 @@
                                                                                              {
                                                                                                  "metadata":  {
                                                                                                                   "dataType":  20,
-                                                                                                                  "category":  4,
+                                                                                                                  "category":  5,
                                                                                                                   "nameResourceKey":  "appBundleIdColumn",
                                                                                                                   "descriptionResourceKey":  "empty",
                                                                                                                   "emptyValueResourceKey":  "bundleIdExample",
@@ -48,7 +48,7 @@
                                                                                              {
                                                                                                  "metadata":  {
                                                                                                                   "dataType":  20,
-                                                                                                                  "category":  4,
+                                                                                                                  "category":  5,
                                                                                                                   "nameResourceKey":  "appNameName",
                                                                                                                   "descriptionResourceKey":  "empty",
                                                                                                                   "childSettings":  [
@@ -66,7 +66,7 @@
                                                                                              {
                                                                                                  "metadata":  {
                                                                                                                   "dataType":  20,
-                                                                                                                  "category":  4,
+                                                                                                                  "category":  5,
                                                                                                                   "nameResourceKey":  "appPublisherName",
                                                                                                                   "descriptionResourceKey":  "empty",
                                                                                                                   "childSettings":  [
@@ -83,7 +83,7 @@
                                                                                              }
                                                                                          ],
                                                                              "dataType":  21,
-                                                                             "category":  4,
+                                                                             "category":  5,
                                                                              "nameResourceKey":  "appListTableName",
                                                                              "descriptionResourceKey":  "googleAppUrlHelp",
                                                                              "childSettings":  [

Documentation/ObjectInfo/applicationrestrictions_iosgeneral.json

@@ -1,10 +1,10 @@
-{
+{
     "applicationrestrictions_iosgeneral":  [
                                                {
                                                    "isSettingDescription":  false,
                                                    "showAsSectionHeader":  false,
                                                    "dataType":  8,
-                                                   "category":  4,
+                                                   "category":  5,
                                                    "nameResourceKey":  "IosGeneralApplicationRestrictionsHeader",
                                                    "childSettings":  [
 
@@ -13,20 +13,20 @@
 
                                                                ],
                                                    "booleanActions":  0,
-                                                   "policyType":  45,
+                                                   "policyType":  46,
                                                    "enabled":  true
                                                },
                                                {
                                                    "isSettingDescription":  false,
                                                    "showAsSectionHeader":  true,
                                                    "dataType":  8,
-                                                   "category":  4,
+                                                   "category":  5,
                                                    "nameResourceKey":  "deviceEnrollmentAndAutomatedDeviceEnrollmentHeaderName",
                                                    "descriptionResourceKey":  "deviceEnrollmentAndAutomatedDeviceEnrollmentHeaderDescription",
                                                    "childSettings":  [
                                                                          {
                                                                              "dataType":  16,
-                                                                             "category":  4,
+                                                                             "category":  5,
                                                                              "nameResourceKey":  "restrictedAppsListOptionsName",
                                                                              "descriptionResourceKey":  "restrictedAppsListOptionsDescription",
                                                                              "childSettings":  [
@@ -35,7 +35,7 @@
                                                                                                                        {
                                                                                                                            "metadata":  {
                                                                                                                                             "dataType":  20,
-                                                                                                                                            "category":  4,
+                                                                                                                                            "category":  5,
                                                                                                                                             "nameResourceKey":  "appUrlName",
                                                                                                                                             "descriptionResourceKey":  "empty",
                                                                                                                                             "emptyValueResourceKey":  "kioskModeAppStoreExample",
@@ -47,14 +47,14 @@
                                                                                                                                                         ],
                                                                                                                                             "entityKey":  "appStoreUrl",
                                                                                                                                             "booleanActions":  0,
-                                                                                                                                            "policyType":  45,
+                                                                                                                                            "policyType":  46,
                                                                                                                                             "enabled":  true
                                                                                                                                         }
                                                                                                                        },
                                                                                                                        {
                                                                                                                            "metadata":  {
                                                                                                                                             "dataType":  20,
-                                                                                                                                            "category":  4,
+                                                                                                                                            "category":  5,
                                                                                                                                             "nameResourceKey":  "appBundleIdColumn",
                                                                                                                                             "descriptionResourceKey":  "empty",
                                                                                                                                             "emptyValueResourceKey":  "bundleIdExample",
@@ -66,14 +66,14 @@
                                                                                                                                                         ],
                                                                                                                                             "entityKey":  "appId",
                                                                                                                                             "booleanActions":  0,
-                                                                                                                                            "policyType":  45,
+                                                                                                                                            "policyType":  46,
                                                                                                                                             "enabled":  true
                                                                                                                                         }
                                                                                                                        },
                                                                                                                        {
                                                                                                                            "metadata":  {
                                                                                                                                             "dataType":  20,
-                                                                                                                                            "category":  4,
+                                                                                                                                            "category":  5,
                                                                                                                                             "nameResourceKey":  "appNameName",
                                                                                                                                             "descriptionResourceKey":  "empty",
                                                                                                                                             "childSettings":  [
@@ -84,14 +84,14 @@
                                                                                                                                                         ],
                                                                                                                                             "entityKey":  "name",
                                                                                                                                             "booleanActions":  0,
-                                                                                                                                            "policyType":  45,
+                                                                                                                                            "policyType":  46,
                                                                                                                                             "enabled":  true
                                                                                                                                         }
                                                                                                                        },
                                                                                                                        {
                                                                                                                            "metadata":  {
                                                                                                                                             "dataType":  20,
-                                                                                                                                            "category":  4,
+                                                                                                                                            "category":  5,
                                                                                                                                             "nameResourceKey":  "appPublisherName",
                                                                                                                                             "descriptionResourceKey":  "empty",
                                                                                                                                             "childSettings":  [
@@ -102,13 +102,13 @@
                                                                                                                                                         ],
                                                                                                                                             "entityKey":  "publisher",
                                                                                                                                             "booleanActions":  0,
-                                                                                                                                            "policyType":  45,
+                                                                                                                                            "policyType":  46,
                                                                                                                                             "enabled":  true
                                                                                                                                         }
                                                                                                                        }
                                                                                                                    ],
                                                                                                        "dataType":  21,
-                                                                                                       "category":  4,
+                                                                                                       "category":  5,
                                                                                                        "nameResourceKey":  "appListTableName",
                                                                                                        "descriptionResourceKey":  "iosAppUrlHelp",
                                                                                                        "childSettings":  [
@@ -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

@@ -1,15 +1,15 @@
-{
+{
     "applicationrestrictions_macgeneral":  {
                                                "isSettingDescription":  false,
                                                "showAsSectionHeader":  true,
                                                "dataType":  8,
-                                               "category":  4,
+                                               "category":  5,
                                                "nameResourceKey":  "allEnrollmentTypesHeaderNameMac",
                                                "descriptionResourceKey":  "allEnrollmentTypesHeaderDescriptionMac",
                                                "childSettings":  [
                                                                      {
                                                                          "dataType":  16,
-                                                                         "category":  4,
+                                                                         "category":  5,
                                                                          "nameResourceKey":  "restrictedAppsListOptionsName",
                                                                          "descriptionResourceKey":  "restrictedAppsListOptionsDescription",
                                                                          "childSettings":  [
@@ -18,7 +18,7 @@
                                                                                                                    {
                                                                                                                        "metadata":  {
                                                                                                                                         "dataType":  20,
-                                                                                                                                        "category":  4,
+                                                                                                                                        "category":  5,
                                                                                                                                         "nameResourceKey":  "appBundleIdColumn",
                                                                                                                                         "descriptionResourceKey":  "empty",
                                                                                                                                         "emptyValueResourceKey":  "bundleIdExample",
@@ -30,14 +30,14 @@
                                                                                                                                                     ],
                                                                                                                                         "entityKey":  "appId",
                                                                                                                                         "booleanActions":  0,
-                                                                                                                                        "policyType":  60,
+                                                                                                                                        "policyType":  61,
                                                                                                                                         "enabled":  true
                                                                                                                                     }
                                                                                                                    },
                                                                                                                    {
                                                                                                                        "metadata":  {
                                                                                                                                         "dataType":  20,
-                                                                                                                                        "category":  4,
+                                                                                                                                        "category":  5,
                                                                                                                                         "nameResourceKey":  "appNameName",
                                                                                                                                         "descriptionResourceKey":  "empty",
                                                                                                                                         "childSettings":  [
@@ -48,14 +48,14 @@
                                                                                                                                                     ],
                                                                                                                                         "entityKey":  "name",
                                                                                                                                         "booleanActions":  0,
-                                                                                                                                        "policyType":  60,
+                                                                                                                                        "policyType":  61,
                                                                                                                                         "enabled":  true
                                                                                                                                     }
                                                                                                                    },
                                                                                                                    {
                                                                                                                        "metadata":  {
                                                                                                                                         "dataType":  20,
-                                                                                                                                        "category":  4,
+                                                                                                                                        "category":  5,
                                                                                                                                         "nameResourceKey":  "appPublisherName",
                                                                                                                                         "descriptionResourceKey":  "empty",
                                                                                                                                         "childSettings":  [
@@ -66,13 +66,13 @@
                                                                                                                                                     ],
                                                                                                                                         "entityKey":  "publisher",
                                                                                                                                         "booleanActions":  0,
-                                                                                                                                        "policyType":  60,
+                                                                                                                                        "policyType":  61,
                                                                                                                                         "enabled":  true
                                                                                                                                     }
                                                                                                                    }
                                                                                                                ],
                                                                                                    "dataType":  21,
-                                                                                                   "category":  4,
+                                                                                                   "category":  5,
                                                                                                    "nameResourceKey":  "appListTableName",
                                                                                                    "descriptionResourceKey":  "",
                                                                                                    "childSettings":  [
@@ -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

@@ -1,7 +1,7 @@
-{
+{
     "applicationrestrictions_windowsphonegeneral":  {
                                                         "dataType":  16,
-                                                        "category":  4,
+                                                        "category":  5,
                                                         "nameResourceKey":  "blockUsageofUserInstalledStoreApps",
                                                         "descriptionResourceKey":  "windowsAppNonComplianceTypeDescription",
                                                         "childSettings":  [
@@ -10,7 +10,7 @@
                                                                                                   {
                                                                                                       "metadata":  {
                                                                                                                        "dataType":  20,
-                                                                                                                       "category":  4,
+                                                                                                                       "category":  5,
                                                                                                                        "nameResourceKey":  "appUrlName",
                                                                                                                        "descriptionResourceKey":  "windowsAppUrlHelp",
                                                                                                                        "emptyValueResourceKey":  "windowsAppUrlExample",
@@ -22,14 +22,14 @@
                                                                                                                                    ],
                                                                                                                        "entityKey":  "appStoreUrl",
                                                                                                                        "booleanActions":  0,
-                                                                                                                       "policyType":  100,
+                                                                                                                       "policyType":  101,
                                                                                                                        "enabled":  true
                                                                                                                    }
                                                                                                   },
                                                                                                   {
                                                                                                       "metadata":  {
                                                                                                                        "dataType":  20,
-                                                                                                                       "category":  4,
+                                                                                                                       "category":  5,
                                                                                                                        "nameResourceKey":  "appNameName",
                                                                                                                        "descriptionResourceKey":  "forYourOwnReference",
                                                                                                                        "childSettings":  [
@@ -40,14 +40,14 @@
                                                                                                                                    ],
                                                                                                                        "entityKey":  "name",
                                                                                                                        "booleanActions":  0,
-                                                                                                                       "policyType":  100,
+                                                                                                                       "policyType":  101,
                                                                                                                        "enabled":  true
                                                                                                                    }
                                                                                                   },
                                                                                                   {
                                                                                                       "metadata":  {
                                                                                                                        "dataType":  20,
-                                                                                                                       "category":  4,
+                                                                                                                       "category":  5,
                                                                                                                        "nameResourceKey":  "appPublisherName",
                                                                                                                        "descriptionResourceKey":  "forYourOwnReference",
                                                                                                                        "childSettings":  [
@@ -58,13 +58,13 @@
                                                                                                                                    ],
                                                                                                                        "entityKey":  "publisher",
                                                                                                                        "booleanActions":  0,
-                                                                                                                       "policyType":  100,
+                                                                                                                       "policyType":  101,
                                                                                                                        "enabled":  true
                                                                                                                    }
                                                                                                   }
                                                                                               ],
                                                                                   "dataType":  21,
-                                                                                  "category":  4,
+                                                                                  "category":  5,
                                                                                   "nameResourceKey":  "appListTableName",
                                                                                   "descriptionResourceKey":  "windowsAppUrlHelp",
                                                                                   "childSettings":  [
@@ -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

@@ -1,8 +1,8 @@
-{
+{
     "applications_windows10general":  [
                                           {
                                               "dataType":  0,
-                                              "category":  6,
+                                              "category":  7,
                                               "nameResourceKey":  "blockAppStoreWindowsMobileOnlyName",
                                               "descriptionResourceKey":  "empty",
                                               "childSettings":  [
@@ -14,12 +14,12 @@
                                               "entityKey":  "windowsStoreBlocked",
                                               "booleanActions":  3,
                                               "defaultValue":  false,
-                                              "policyType":  78,
+                                              "policyType":  79,
                                               "enabled":  true
                                           },
                                           {
                                               "dataType":  0,
-                                              "category":  6,
+                                              "category":  7,
                                               "nameResourceKey":  "blockAppStoreAutoUpdate",
                                               "descriptionResourceKey":  "blockAppStoreAutoUpdateDescription",
                                               "childSettings":  [
@@ -31,12 +31,12 @@
                                               "entityKey":  "windowsStoreBlockAutoUpdate",
                                               "booleanActions":  3,
                                               "defaultValue":  false,
-                                              "policyType":  78,
+                                              "policyType":  79,
                                               "enabled":  true
                                           },
                                           {
                                               "dataType":  16,
-                                              "category":  6,
+                                              "category":  7,
                                               "nameResourceKey":  "allowAllTrustedAppsSideloading",
                                               "descriptionResourceKey":  "allowAllTrustedAppsSideloadingDescription",
                                               "childSettings":  [
@@ -63,12 +63,12 @@
                                               "booleanActions":  0,
                                               "defaultValue":  "notConfigured",
                                               "unconfiguredValue":  "notConfigured",
-                                              "policyType":  78,
+                                              "policyType":  79,
                                               "enabled":  true
                                           },
                                           {
                                               "dataType":  16,
-                                              "category":  6,
+                                              "category":  7,
                                               "nameResourceKey":  "developerUnlock",
                                               "descriptionResourceKey":  "developerUnlockDescription",
                                               "childSettings":  [
@@ -95,12 +95,12 @@
                                               "booleanActions":  0,
                                               "defaultValue":  "notConfigured",
                                               "unconfiguredValue":  "notConfigured",
-                                              "policyType":  78,
+                                              "policyType":  79,
                                               "enabled":  true
                                           },
                                           {
                                               "dataType":  0,
-                                              "category":  6,
+                                              "category":  7,
                                               "nameResourceKey":  "allowSharedUserAppData",
                                               "descriptionResourceKey":  "allowSharedUserAppDataDescription",
                                               "childSettings":  [
@@ -112,12 +112,12 @@
                                               "entityKey":  "sharedUserAppDataAllowed",
                                               "booleanActions":  0,
                                               "defaultValue":  false,
-                                              "policyType":  78,
+                                              "policyType":  79,
                                               "enabled":  true
                                           },
                                           {
                                               "dataType":  0,
-                                              "category":  6,
+                                              "category":  7,
                                               "nameResourceKey":  "enableUsePrivateStoreOnly",
                                               "descriptionResourceKey":  "enableUsePrivateStoreOnlyDescription",
                                               "childSettings":  [
@@ -129,12 +129,12 @@
                                               "entityKey":  "windowsStoreEnablePrivateStoreOnly",
                                               "booleanActions":  0,
                                               "defaultValue":  false,
-                                              "policyType":  78,
+                                              "policyType":  79,
                                               "enabled":  true
                                           },
                                           {
                                               "dataType":  0,
-                                              "category":  6,
+                                              "category":  7,
                                               "nameResourceKey":  "blockStoreOriginatedApps",
                                               "descriptionResourceKey":  "blockStoreOriginatedAppsDescription",
                                               "childSettings":  [
@@ -146,12 +146,12 @@
                                               "entityKey":  "appsBlockWindowsStoreOriginatedApps",
                                               "booleanActions":  3,
                                               "defaultValue":  false,
-                                              "policyType":  78,
+                                              "policyType":  79,
                                               "enabled":  true
                                           },
                                           {
                                               "dataType":  0,
-                                              "category":  6,
+                                              "category":  7,
                                               "nameResourceKey":  "restrictAppDataToSystemVolume",
                                               "descriptionResourceKey":  "restrictAppDataToSystemVolumeDescription",
                                               "childSettings":  [
@@ -163,12 +163,12 @@
                                               "entityKey":  "storageRestrictAppDataToSystemVolume",
                                               "booleanActions":  3,
                                               "defaultValue":  false,
-                                              "policyType":  78,
+                                              "policyType":  79,
                                               "enabled":  true
                                           },
                                           {
                                               "dataType":  0,
-                                              "category":  6,
+                                              "category":  7,
                                               "nameResourceKey":  "restrictAppInstallToSystemVolume",
                                               "descriptionResourceKey":  "restrictAppInstallToSystemVolumeDescription",
                                               "childSettings":  [
@@ -180,12 +180,12 @@
                                               "entityKey":  "storageRestrictAppInstallToSystemVolume",
                                               "booleanActions":  3,
                                               "defaultValue":  false,
-                                              "policyType":  78,
+                                              "policyType":  79,
                                               "enabled":  true
                                           },
                                           {
                                               "dataType":  0,
-                                              "category":  6,
+                                              "category":  7,
                                               "nameResourceKey":  "blockGameDvr",
                                               "descriptionResourceKey":  "blockGameDvrDescription",
                                               "childSettings":  [
@@ -197,12 +197,12 @@
                                               "entityKey":  "gameDvrBlocked",
                                               "booleanActions":  3,
                                               "defaultValue":  false,
-                                              "policyType":  78,
+                                              "policyType":  79,
                                               "enabled":  true
                                           },
                                           {
                                               "dataType":  0,
-                                              "category":  6,
+                                              "category":  7,
                                               "nameResourceKey":  "enableAppInstallControlName",
                                               "descriptionResourceKey":  "enableAppInstallControlDescription",
                                               "childSettings":  [
@@ -214,12 +214,12 @@
                                               "entityKey":  "smartScreenEnableAppInstallControl",
                                               "booleanActions":  1,
                                               "defaultValue":  false,
-                                              "policyType":  78,
+                                              "policyType":  79,
                                               "enabled":  false
                                           },
                                           {
                                               "dataType":  16,
-                                              "category":  6,
+                                              "category":  7,
                                               "nameResourceKey":  "smartScreenAppInstallControlName",
                                               "descriptionResourceKey":  "smartScreenAppInstallControlDescription",
                                               "childSettings":  [
@@ -255,12 +255,12 @@
                                               "entityKey":  "smartScreenAppInstallControl",
                                               "booleanActions":  0,
                                               "defaultValue":  "notConfigured",
-                                              "policyType":  78,
+                                              "policyType":  79,
                                               "enabled":  true
                                           },
                                           {
                                               "dataType":  19,
-                                              "category":  6,
+                                              "category":  7,
                                               "nameResourceKey":  "appManagementMSIAllowUserControlOverInstallName",
                                               "descriptionResourceKey":  "appManagementMSIAllowUserControlOverInstallDesc",
                                               "childSettings":  [
@@ -282,12 +282,12 @@
                                               "booleanActions":  0,
                                               "defaultValue":  false,
                                               "unconfiguredValue":  false,
-                                              "policyType":  78,
+                                              "policyType":  79,
                                               "enabled":  true
                                           },
                                           {
                                               "dataType":  19,
-                                              "category":  6,
+                                              "category":  7,
                                               "nameResourceKey":  "appManagementMSIAlwaysInstallWithElevatedPrivilegesName",
                                               "descriptionResourceKey":  "appManagementMSIAlwaysInstallWithElevatedPrivilegesDesc",
                                               "childSettings":  [
@@ -309,12 +309,12 @@
                                               "booleanActions":  0,
                                               "defaultValue":  false,
                                               "unconfiguredValue":  false,
-                                              "policyType":  78,
+                                              "policyType":  79,
                                               "enabled":  true
                                           },
                                           {
                                               "dataType":  12,
-                                              "category":  6,
+                                              "category":  7,
                                               "nameResourceKey":  "appManagementPackageFamilyNamesToLaunchAfterLogOnName",
                                               "descriptionResourceKey":  "appManagementPackageFamilyNamesToLaunchAfterLogOnDescription",
                                               "emptyValueResourceKey":  "appManagementPackageFamilyNamesToLaunchAfterLogOnPlaceholder",
@@ -327,7 +327,7 @@
                                               "entityKey":  "appManagementPackageFamilyNamesToLaunchAfterLogOn",
                                               "booleanActions":  0,
                                               "defaultValue":  "",
-                                              "policyType":  78,
+                                              "policyType":  79,
                                               "enabled":  true
                                           }
                                       ]

Documentation/ObjectInfo/applications_windowsphonegeneral.json

@@ -1,7 +1,7 @@
-{
+{
     "applications_windowsphonegeneral":  {
                                              "dataType":  0,
-                                             "category":  6,
+                                             "category":  7,
                                              "nameResourceKey":  "blockApplicationStoreName",
                                              "descriptionResourceKey":  "empty",
                                              "childSettings":  [
@@ -13,7 +13,7 @@
                                              "entityKey":  "windowsStoreBlocked",
                                              "booleanActions":  3,
                                              "defaultValue":  false,
-                                             "policyType":  100,
+                                             "policyType":  101,
                                              "enabled":  true
                                          }
 }

Documentation/ObjectInfo/applicationsandgames_iosgeneral.json

@@ -1,21 +1,21 @@
-{
+{
     "applicationsandgames_iosgeneral":  [
                                             {
                                                 "isSettingDescription":  false,
                                                 "showAsSectionHeader":  true,
                                                 "dataType":  8,
-                                                "category":  7,
+                                                "category":  8,
                                                 "nameResourceKey":  "allEnrollmentTypesHeaderName",
                                                 "descriptionResourceKey":  "allEnrollmentTypesHeaderDescription",
                                                 "childSettings":  [
                                                                       {
                                                                           "dataType":  0,
-                                                                          "category":  7,
+                                                                          "category":  8,
                                                                           "nameResourceKey":  "blockManagedDocumentsInUnmanagedAppsName",
                                                                           "childSettings":  [
                                                                                                 {
                                                                                                     "dataType":  0,
-                                                                                                    "category":  7,
+                                                                                                    "category":  8,
                                                                                                     "nameResourceKey":  "allowUnmanagedToReadManagedContactsName",
                                                                                                     "descriptionResourceKey":  "allowUnmanagedToReadManagedContactsDescription",
                                                                                                     "childSettings":  [
@@ -27,7 +27,7 @@
                                                                                                     "entityKey":  "contactsAllowUnmanagedToManagedRead",
                                                                                                     "booleanActions":  9,
                                                                                                     "defaultValue":  false,
-                                                                                                    "policyType":  45,
+                                                                                                    "policyType":  46,
                                                                                                     "enabled":  true
                                                                                                 }
                                                                                             ],
@@ -37,12 +37,12 @@
                                                                           "entityKey":  "documentsBlockManagedDocumentsInUnmanagedApps",
                                                                           "booleanActions":  9,
                                                                           "defaultValue":  false,
-                                                                          "policyType":  45,
+                                                                          "policyType":  46,
                                                                           "enabled":  true
                                                                       },
                                                                       {
                                                                           "dataType":  0,
-                                                                          "category":  7,
+                                                                          "category":  8,
                                                                           "nameResourceKey":  "forceAirDropToBeUnmanagedTargetName",
                                                                           "descriptionResourceKey":  "forceAirDropToBeUnmanagedTargetDescription",
                                                                           "childSettings":  [
@@ -54,12 +54,12 @@
                                                                           "entityKey":  "airDropForceUnmanagedDropTarget",
                                                                           "booleanActions":  9,
                                                                           "defaultValue":  false,
-                                                                          "policyType":  45,
+                                                                          "policyType":  46,
                                                                           "enabled":  true
                                                                       },
                                                                       {
                                                                           "dataType":  0,
-                                                                          "category":  7,
+                                                                          "category":  8,
                                                                           "nameResourceKey":  "blockUnmanagedDocumentsInManagedAppsName",
                                                                           "childSettings":  [
 
@@ -70,7 +70,24 @@
                                                                           "entityKey":  "documentsBlockUnmanagedDocumentsInManagedApps",
                                                                           "booleanActions":  9,
                                                                           "defaultValue":  false,
-                                                                          "policyType":  45,
+                                                                          "policyType":  46,
+                                                                          "enabled":  true
+                                                                      },
+                                                                      {
+                                                                          "dataType":  0,
+                                                                          "category":  8,
+                                                                          "nameResourceKey":  "managedPasteboardRequiredName",
+                                                                          "descriptionResourceKey":  "managedPasteboardRequiredDescription",
+                                                                          "childSettings":  [
+
+                                                                                            ],
+                                                                          "options":  [
+
+                                                                                      ],
+                                                                          "entityKey":  "managedPasteboardRequired",
+                                                                          "booleanActions":  9,
+                                                                          "defaultValue":  false,
+                                                                          "policyType":  46,
                                                                           "enabled":  true
                                                                       }
                                                                   ],
@@ -78,20 +95,20 @@
 
                                                             ],
                                                 "booleanActions":  0,
-                                                "policyType":  45,
+                                                "policyType":  46,
                                                 "enabled":  true
                                             },
                                             {
                                                 "isSettingDescription":  false,
                                                 "showAsSectionHeader":  true,
                                                 "dataType":  8,
-                                                "category":  7,
+                                                "category":  8,
                                                 "nameResourceKey":  "deviceEnrollmentAndAutomatedDeviceEnrollmentHeaderName",
                                                 "descriptionResourceKey":  "deviceEnrollmentAndAutomatedDeviceEnrollmentHeaderDescription",
                                                 "childSettings":  [
                                                                       {
                                                                           "dataType":  0,
-                                                                          "category":  7,
+                                                                          "category":  8,
                                                                           "nameResourceKey":  "requireAppStorePasswordName",
                                                                           "descriptionResourceKey":  "requireAppStorePasswordDescription",
                                                                           "childSettings":  [
@@ -103,12 +120,12 @@
                                                                           "entityKey":  "appStoreRequirePassword",
                                                                           "booleanActions":  9,
                                                                           "defaultValue":  false,
-                                                                          "policyType":  45,
+                                                                          "policyType":  46,
                                                                           "enabled":  true
                                                                       },
                                                                       {
                                                                           "dataType":  0,
-                                                                          "category":  7,
+                                                                          "category":  8,
                                                                           "nameResourceKey":  "blockInAppPurchasesName",
                                                                           "childSettings":  [
 
@@ -119,12 +136,12 @@
                                                                           "entityKey":  "appStoreBlockInAppPurchases",
                                                                           "booleanActions":  9,
                                                                           "defaultValue":  false,
-                                                                          "policyType":  45,
+                                                                          "policyType":  46,
                                                                           "enabled":  true
                                                                       },
                                                                       {
                                                                           "dataType":  0,
-                                                                          "category":  7,
+                                                                          "category":  8,
                                                                           "nameResourceKey":  "blockIBooksStoreEroticaName",
                                                                           "descriptionResourceKey":  "blockIBooksStoreEroticaDescription",
                                                                           "childSettings":  [
@@ -136,12 +153,12 @@
                                                                           "entityKey":  "iBooksStoreBlockErotica",
                                                                           "booleanActions":  9,
                                                                           "defaultValue":  false,
-                                                                          "policyType":  45,
+                                                                          "policyType":  46,
                                                                           "enabled":  true
                                                                       },
                                                                       {
                                                                           "dataType":  0,
-                                                                          "category":  7,
+                                                                          "category":  8,
                                                                           "nameResourceKey":  "allowManagedToWriteUnmanagedContactsName",
                                                                           "descriptionResourceKey":  "allowManagedToWriteUnmanagedContactsDescription",
                                                                           "childSettings":  [
@@ -153,12 +170,12 @@
                                                                           "entityKey":  "contactsAllowManagedToUnmanagedWrite",
                                                                           "booleanActions":  9,
                                                                           "defaultValue":  false,
-                                                                          "policyType":  45,
+                                                                          "policyType":  46,
                                                                           "enabled":  true
                                                                       },
                                                                       {
                                                                           "dataType":  16,
-                                                                          "category":  7,
+                                                                          "category":  8,
                                                                           "nameResourceKey":  "mediaContentRatingCountryRegionName",
                                                                           "descriptionResourceKey":  "mediaContentRatingCountryRegionDescription",
                                                                           "childSettings":  [
@@ -178,7 +195,7 @@
                                                                                                                    "complexOptions":  [
                                                                                                                                           {
                                                                                                                                               "dataType":  16,
-                                                                                                                                              "category":  7,
+                                                                                                                                              "category":  8,
                                                                                                                                               "nameResourceKey":  "mediaContentRatingMoviesName",
                                                                                                                                               "descriptionResourceKey":  "mediaContentRatingMoviesDescription",
                                                                                                                                               "childSettings":  [
@@ -224,12 +241,12 @@
                                                                                                                                               "entityKey":  "movieRating",
                                                                                                                                               "booleanActions":  0,
                                                                                                                                               "defaultValue":  "allAllowed",
-                                                                                                                                              "policyType":  45,
+                                                                                                                                              "policyType":  46,
                                                                                                                                               "enabled":  true
                                                                                                                                           },
                                                                                                                                           {
                                                                                                                                               "dataType":  16,
-                                                                                                                                              "category":  7,
+                                                                                                                                              "category":  8,
                                                                                                                                               "nameResourceKey":  "mediaContentRatingTVName",
                                                                                                                                               "descriptionResourceKey":  "mediaContentRatingTVDescription",
                                                                                                                                               "childSettings":  [
@@ -285,12 +302,12 @@
                                                                                                                                               "entityKey":  "tvRating",
                                                                                                                                               "booleanActions":  0,
                                                                                                                                               "defaultValue":  "allAllowed",
-                                                                                                                                              "policyType":  45,
+                                                                                                                                              "policyType":  46,
                                                                                                                                               "enabled":  true
                                                                                                                                           }
                                                                                                                                       ],
                                                                                                                    "dataType":  6,
-                                                                                                                   "category":  7,
+                                                                                                                   "category":  8,
                                                                                                                    "nameResourceKey":  "mediaContentRatingAustraliaName",
                                                                                                                    "descriptionResourceKey":  "empty",
                                                                                                                    "childSettings":  [
@@ -301,12 +318,12 @@
                                                                                                                                ],
                                                                                                                    "entityKey":  "mediaContentRatingAustralia",
                                                                                                                    "booleanActions":  0,
-                                                                                                                   "policyType":  45,
+                                                                                                                   "policyType":  46,
                                                                                                                    "enabled":  true
                                                                                                                },
                                                                                                                {
                                                                                                                    "dataType":  16,
-                                                                                                                   "category":  7,
+                                                                                                                   "category":  8,
                                                                                                                    "nameResourceKey":  "mediaContentRatingAppsName",
                                                                                                                    "descriptionResourceKey":  "mediaContentRatingAppsDescription",
                                                                                                                    "childSettings":  [
@@ -348,7 +365,7 @@
                                                                                                                    "booleanActions":  0,
                                                                                                                    "defaultValue":  "allAllowed",
                                                                                                                    "unconfiguredValue":  "allAllowed",
-                                                                                                                   "policyType":  45,
+                                                                                                                   "policyType":  46,
                                                                                                                    "enabled":  true
                                                                                                                }
                                                                                                            ],
@@ -362,7 +379,7 @@
                                                                                                                    "complexOptions":  [
                                                                                                                                           {
                                                                                                                                               "dataType":  16,
-                                                                                                                                              "category":  7,
+                                                                                                                                              "category":  8,
                                                                                                                                               "nameResourceKey":  "mediaContentRatingMoviesName",
                                                                                                                                               "descriptionResourceKey":  "mediaContentRatingMoviesDescription",
                                                                                                                                               "childSettings":  [
@@ -408,12 +425,12 @@
                                                                                                                                               "entityKey":  "movieRating",
                                                                                                                                               "booleanActions":  0,
                                                                                                                                               "defaultValue":  "allAllowed",
-                                                                                                                                              "policyType":  45,
+                                                                                                                                              "policyType":  46,
                                                                                                                                               "enabled":  true
                                                                                                                                           },
                                                                                                                                           {
                                                                                                                                               "dataType":  16,
-                                                                                                                                              "category":  7,
+                                                                                                                                              "category":  8,
                                                                                                                                               "nameResourceKey":  "mediaContentRatingTVName",
                                                                                                                                               "descriptionResourceKey":  "mediaContentRatingTVDescription",
                                                                                                                                               "childSettings":  [
@@ -464,12 +481,12 @@
                                                                                                                                               "entityKey":  "tvRating",
                                                                                                                                               "booleanActions":  0,
                                                                                                                                               "defaultValue":  "allAllowed",
-                                                                                                                                              "policyType":  45,
+                                                                                                                                              "policyType":  46,
                                                                                                                                               "enabled":  true
                                                                                                                                           }
                                                                                                                                       ],
                                                                                                                    "dataType":  6,
-                                                                                                                   "category":  7,
+                                                                                                                   "category":  8,
                                                                                                                    "nameResourceKey":  "mediaContentRatingCanadaName",
                                                                                                                    "descriptionResourceKey":  "empty",
                                                                                                                    "childSettings":  [
@@ -480,12 +497,12 @@
                                                                                                                                ],
                                                                                                                    "entityKey":  "mediaContentRatingCanada",
                                                                                                                    "booleanActions":  0,
-                                                                                                                   "policyType":  45,
+                                                                                                                   "policyType":  46,
                                                                                                                    "enabled":  true
                                                                                                                },
                                                                                                                {
                                                                                                                    "dataType":  16,
-                                                                                                                   "category":  7,
+                                                                                                                   "category":  8,
                                                                                                                    "nameResourceKey":  "mediaContentRatingAppsName",
                                                                                                                    "descriptionResourceKey":  "mediaContentRatingAppsDescription",
                                                                                                                    "childSettings":  [
@@ -527,7 +544,7 @@
                                                                                                                    "booleanActions":  0,
                                                                                                                    "defaultValue":  "allAllowed",
                                                                                                                    "unconfiguredValue":  "allAllowed",
-                                                                                                                   "policyType":  45,
+                                                                                                                   "policyType":  46,
                                                                                                                    "enabled":  true
                                                                                                                }
                                                                                                            ],
@@ -541,7 +558,7 @@
                                                                                                                    "complexOptions":  [
                                                                                                                                           {
                                                                                                                                               "dataType":  16,
-                                                                                                                                              "category":  7,
+                                                                                                                                              "category":  8,
                                                                                                                                               "nameResourceKey":  "mediaContentRatingMoviesName",
                                                                                                                                               "descriptionResourceKey":  "mediaContentRatingMoviesDescription",
                                                                                                                                               "childSettings":  [
@@ -582,12 +599,12 @@
                                                                                                                                               "entityKey":  "movieRating",
                                                                                                                                               "booleanActions":  0,
                                                                                                                                               "defaultValue":  "allAllowed",
-                                                                                                                                              "policyType":  45,
+                                                                                                                                              "policyType":  46,
                                                                                                                                               "enabled":  true
                                                                                                                                           },
                                                                                                                                           {
                                                                                                                                               "dataType":  16,
-                                                                                                                                              "category":  7,
+                                                                                                                                              "category":  8,
                                                                                                                                               "nameResourceKey":  "mediaContentRatingTVName",
                                                                                                                                               "descriptionResourceKey":  "mediaContentRatingTVDescription",
                                                                                                                                               "childSettings":  [
@@ -628,12 +645,12 @@
                                                                                                                                               "entityKey":  "tvRating",
                                                                                                                                               "booleanActions":  0,
                                                                                                                                               "defaultValue":  "allAllowed",
-                                                                                                                                              "policyType":  45,
+                                                                                                                                              "policyType":  46,
                                                                                                                                               "enabled":  true
                                                                                                                                           }
                                                                                                                                       ],
                                                                                                                    "dataType":  6,
-                                                                                                                   "category":  7,
+                                                                                                                   "category":  8,
                                                                                                                    "nameResourceKey":  "mediaContentRatingFranceName",
                                                                                                                    "descriptionResourceKey":  "empty",
                                                                                                                    "childSettings":  [
@@ -644,12 +661,12 @@
                                                                                                                                ],
                                                                                                                    "entityKey":  "mediaContentRatingFrance",
                                                                                                                    "booleanActions":  0,
-                                                                                                                   "policyType":  45,
+                                                                                                                   "policyType":  46,
                                                                                                                    "enabled":  true
                                                                                                                },
                                                                                                                {
                                                                                                                    "dataType":  16,
-                                                                                                                   "category":  7,
+                                                                                                                   "category":  8,
                                                                                                                    "nameResourceKey":  "mediaContentRatingAppsName",
                                                                                                                    "descriptionResourceKey":  "mediaContentRatingAppsDescription",
                                                                                                                    "childSettings":  [
@@ -691,7 +708,7 @@
                                                                                                                    "booleanActions":  0,
                                                                                                                    "defaultValue":  "allAllowed",
                                                                                                                    "unconfiguredValue":  "allAllowed",
-                                                                                                                   "policyType":  45,
+                                                                                                                   "policyType":  46,
                                                                                                                    "enabled":  true
                                                                                                                }
                                                                                                            ],
@@ -705,7 +722,7 @@
                                                                                                                    "complexOptions":  [
                                                                                                                                           {
                                                                                                                                               "dataType":  16,
-                                                                                                                                              "category":  7,
+                                                                                                                                              "category":  8,
                                                                                                                                               "nameResourceKey":  "mediaContentRatingMoviesName",
                                                                                                                                               "descriptionResourceKey":  "mediaContentRatingMoviesDescription",
                                                                                                                                               "childSettings":  [
@@ -751,12 +768,12 @@
                                                                                                                                               "entityKey":  "movieRating",
                                                                                                                                               "booleanActions":  0,
                                                                                                                                               "defaultValue":  "allAllowed",
-                                                                                                                                              "policyType":  45,
+                                                                                                                                              "policyType":  46,
                                                                                                                                               "enabled":  true
                                                                                                                                           },
                                                                                                                                           {
                                                                                                                                               "dataType":  16,
-                                                                                                                                              "category":  7,
+                                                                                                                                              "category":  8,
                                                                                                                                               "nameResourceKey":  "mediaContentRatingTVName",
                                                                                                                                               "descriptionResourceKey":  "mediaContentRatingTVDescription",
                                                                                                                                               "childSettings":  [
@@ -802,12 +819,12 @@
                                                                                                                                               "entityKey":  "tvRating",
                                                                                                                                               "booleanActions":  0,
                                                                                                                                               "defaultValue":  "allAllowed",
-                                                                                                                                              "policyType":  45,
+                                                                                                                                              "policyType":  46,
                                                                                                                                               "enabled":  true
                                                                                                                                           }
                                                                                                                                       ],
                                                                                                                    "dataType":  6,
-                                                                                                                   "category":  7,
+                                                                                                                   "category":  8,
                                                                                                                    "nameResourceKey":  "mediaContentRatingGermanyName",
                                                                                                                    "descriptionResourceKey":  "empty",
                                                                                                                    "childSettings":  [
@@ -818,12 +835,12 @@
                                                                                                                                ],
                                                                                                                    "entityKey":  "mediaContentRatingGermany",
                                                                                                                    "booleanActions":  0,
-                                                                                                                   "policyType":  45,
+                                                                                                                   "policyType":  46,
                                                                                                                    "enabled":  true
                                                                                                                },
                                                                                                                {
                                                                                                                    "dataType":  16,
-                                                                                                                   "category":  7,
+                                                                                                                   "category":  8,
                                                                                                                    "nameResourceKey":  "mediaContentRatingAppsName",
                                                                                                                    "descriptionResourceKey":  "mediaContentRatingAppsDescription",
                                                                                                                    "childSettings":  [
@@ -865,7 +882,7 @@
                                                                                                                    "booleanActions":  0,
                                                                                                                    "defaultValue":  "allAllowed",
                                                                                                                    "unconfiguredValue":  "allAllowed",
-                                                                                                                   "policyType":  45,
+                                                                                                                   "policyType":  46,
                                                                                                                    "enabled":  true
                                                                                                                }
                                                                                                            ],
@@ -879,7 +896,7 @@
                                                                                                                    "complexOptions":  [
                                                                                                                                           {
                                                                                                                                               "dataType":  16,
-                                                                                                                                              "category":  7,
+                                                                                                                                              "category":  8,
                                                                                                                                               "nameResourceKey":  "mediaContentRatingMoviesName",
                                                                                                                                               "descriptionResourceKey":  "mediaContentRatingMoviesDescription",
                                                                                                                                               "childSettings":  [
@@ -930,12 +947,12 @@
                                                                                                                                               "entityKey":  "movieRating",
                                                                                                                                               "booleanActions":  0,
                                                                                                                                               "defaultValue":  "allAllowed",
-                                                                                                                                              "policyType":  45,
+                                                                                                                                              "policyType":  46,
                                                                                                                                               "enabled":  true
                                                                                                                                           },
                                                                                                                                           {
                                                                                                                                               "dataType":  16,
-                                                                                                                                              "category":  7,
+                                                                                                                                              "category":  8,
                                                                                                                                               "nameResourceKey":  "mediaContentRatingTVName",
                                                                                                                                               "descriptionResourceKey":  "mediaContentRatingTVDescription",
                                                                                                                                               "childSettings":  [
@@ -981,12 +998,12 @@
                                                                                                                                               "entityKey":  "tvRating",
                                                                                                                                               "booleanActions":  0,
                                                                                                                                               "defaultValue":  "allAllowed",
-                                                                                                                                              "policyType":  45,
+                                                                                                                                              "policyType":  46,
                                                                                                                                               "enabled":  true
                                                                                                                                           }
                                                                                                                                       ],
                                                                                                                    "dataType":  6,
-                                                                                                                   "category":  7,
+                                                                                                                   "category":  8,
                                                                                                                    "nameResourceKey":  "mediaContentRatingIrelandName",
                                                                                                                    "descriptionResourceKey":  "empty",
                                                                                                                    "childSettings":  [
@@ -997,12 +1014,12 @@
                                                                                                                                ],
                                                                                                                    "entityKey":  "mediaContentRatingIreland",
                                                                                                                    "booleanActions":  0,
-                                                                                                                   "policyType":  45,
+                                                                                                                   "policyType":  46,
                                                                                                                    "enabled":  true
                                                                                                                },
                                                                                                                {
                                                                                                                    "dataType":  16,
-                                                                                                                   "category":  7,
+                                                                                                                   "category":  8,
                                                                                                                    "nameResourceKey":  "mediaContentRatingAppsName",
                                                                                                                    "descriptionResourceKey":  "mediaContentRatingAppsDescription",
                                                                                                                    "childSettings":  [
@@ -1044,7 +1061,7 @@
                                                                                                                    "booleanActions":  0,
                                                                                                                    "defaultValue":  "allAllowed",
                                                                                                                    "unconfiguredValue":  "allAllowed",
-                                                                                                                   "policyType":  45,
+                                                                                                                   "policyType":  46,
                                                                                                                    "enabled":  true
                                                                                                                }
                                                                                                            ],
@@ -1058,7 +1075,7 @@
                                                                                                                    "complexOptions":  [
                                                                                                                                           {
                                                                                                                                               "dataType":  16,
-                                                                                                                                              "category":  7,
+                                                                                                                                              "category":  8,
                                                                                                                                               "nameResourceKey":  "mediaContentRatingMoviesName",
                                                                                                                                               "descriptionResourceKey":  "mediaContentRatingMoviesDescription",
                                                                                                                                               "childSettings":  [
@@ -1099,12 +1116,12 @@
                                                                                                                                               "entityKey":  "movieRating",
                                                                                                                                               "booleanActions":  0,
                                                                                                                                               "defaultValue":  "allAllowed",
-                                                                                                                                              "policyType":  45,
+                                                                                                                                              "policyType":  46,
                                                                                                                                               "enabled":  true
                                                                                                                                           },
                                                                                                                                           {
                                                                                                                                               "dataType":  16,
-                                                                                                                                              "category":  7,
+                                                                                                                                              "category":  8,
                                                                                                                                               "nameResourceKey":  "mediaContentRatingTVName",
                                                                                                                                               "descriptionResourceKey":  "mediaContentRatingTVDescription",
                                                                                                                                               "childSettings":  [
@@ -1130,12 +1147,12 @@
                                                                                                                                               "entityKey":  "tvRating",
                                                                                                                                               "booleanActions":  0,
                                                                                                                                               "defaultValue":  "allAllowed",
-                                                                                                                                              "policyType":  45,
+                                                                                                                                              "policyType":  46,
                                                                                                                                               "enabled":  true
                                                                                                                                           }
                                                                                                                                       ],
                                                                                                                    "dataType":  6,
-                                                                                                                   "category":  7,
+                                                                                                                   "category":  8,
                                                                                                                    "nameResourceKey":  "mediaContentRatingJapanName",
                                                                                                                    "descriptionResourceKey":  "empty",
                                                                                                                    "childSettings":  [
@@ -1146,12 +1163,12 @@
                                                                                                                                ],
                                                                                                                    "entityKey":  "mediaContentRatingJapan",
                                                                                                                    "booleanActions":  0,
-                                                                                                                   "policyType":  45,
+                                                                                                                   "policyType":  46,
                                                                                                                    "enabled":  true
                                                                                                                },
                                                                                                                {
                                                                                                                    "dataType":  16,
-                                                                                                                   "category":  7,
+                                                                                                                   "category":  8,
                                                                                                                    "nameResourceKey":  "mediaContentRatingAppsName",
                                                                                                                    "descriptionResourceKey":  "mediaContentRatingAppsDescription",
                                                                                                                    "childSettings":  [
@@ -1193,7 +1210,7 @@
                                                                                                                    "booleanActions":  0,
                                                                                                                    "defaultValue":  "allAllowed",
                                                                                                                    "unconfiguredValue":  "allAllowed",
-                                                                                                                   "policyType":  45,
+                                                                                                                   "policyType":  46,
                                                                                                                    "enabled":  true
                                                                                                                }
                                                                                                            ],
@@ -1207,7 +1224,7 @@
                                                                                                                    "complexOptions":  [
                                                                                                                                           {
                                                                                                                                               "dataType":  16,
-                                                                                                                                              "category":  7,
+                                                                                                                                              "category":  8,
                                                                                                                                               "nameResourceKey":  "mediaContentRatingMoviesName",
                                                                                                                                               "descriptionResourceKey":  "mediaContentRatingMoviesDescription",
                                                                                                                                               "childSettings":  [
@@ -1273,12 +1290,12 @@
                                                                                                                                               "entityKey":  "movieRating",
                                                                                                                                               "booleanActions":  0,
                                                                                                                                               "defaultValue":  "allAllowed",
-                                                                                                                                              "policyType":  45,
+                                                                                                                                              "policyType":  46,
                                                                                                                                               "enabled":  true
                                                                                                                                           },
                                                                                                                                           {
                                                                                                                                               "dataType":  16,
-                                                                                                                                              "category":  7,
+                                                                                                                                              "category":  8,
                                                                                                                                               "nameResourceKey":  "mediaContentRatingTVName",
                                                                                                                                               "descriptionResourceKey":  "mediaContentRatingTVDescription",
                                                                                                                                               "childSettings":  [
@@ -1314,12 +1331,12 @@
                                                                                                                                               "entityKey":  "tvRating",
                                                                                                                                               "booleanActions":  0,
                                                                                                                                               "defaultValue":  "allAllowed",
-                                                                                                                                              "policyType":  45,
+                                                                                                                                              "policyType":  46,
                                                                                                                                               "enabled":  true
                                                                                                                                           }
                                                                                                                                       ],
                                                                                                                    "dataType":  6,
-                                                                                                                   "category":  7,
+                                                                                                                   "category":  8,
                                                                                                                    "nameResourceKey":  "mediaContentRatingNewZealandName",
                                                                                                                    "descriptionResourceKey":  "empty",
                                                                                                                    "childSettings":  [
@@ -1330,12 +1347,12 @@
                                                                                                                                ],
                                                                                                                    "entityKey":  "mediaContentRatingNewZealand",
                                                                                                                    "booleanActions":  0,
-                                                                                                                   "policyType":  45,
+                                                                                                                   "policyType":  46,
                                                                                                                    "enabled":  true
                                                                                                                },
                                                                                                                {
                                                                                                                    "dataType":  16,
-                                                                                                                   "category":  7,
+                                                                                                                   "category":  8,
                                                                                                                    "nameResourceKey":  "mediaContentRatingAppsName",
                                                                                                                    "descriptionResourceKey":  "mediaContentRatingAppsDescription",
                                                                                                                    "childSettings":  [
@@ -1377,7 +1394,7 @@
                                                                                                                    "booleanActions":  0,
                                                                                                                    "defaultValue":  "allAllowed",
                                                                                                                    "unconfiguredValue":  "allAllowed",
-                                                                                                                   "policyType":  45,
+                                                                                                                   "policyType":  46,
                                                                                                                    "enabled":  true
                                                                                                                }
                                                                                                            ],
@@ -1391,7 +1408,7 @@
                                                                                                                    "complexOptions":  [
                                                                                                                                           {
                                                                                                                                               "dataType":  16,
-                                                                                                                                              "category":  7,
+                                                                                                                                              "category":  8,
                                                                                                                                               "nameResourceKey":  "mediaContentRatingMoviesName",
                                                                                                                                               "descriptionResourceKey":  "mediaContentRatingMoviesDescription",
                                                                                                                                               "childSettings":  [
@@ -1447,12 +1464,12 @@
                                                                                                                                               "entityKey":  "movieRating",
                                                                                                                                               "booleanActions":  0,
                                                                                                                                               "defaultValue":  "allAllowed",
-                                                                                                                                              "policyType":  45,
+                                                                                                                                              "policyType":  46,
                                                                                                                                               "enabled":  true
                                                                                                                                           },
                                                                                                                                           {
                                                                                                                                               "dataType":  16,
-                                                                                                                                              "category":  7,
+                                                                                                                                              "category":  8,
                                                                                                                                               "nameResourceKey":  "mediaContentRatingTVName",
                                                                                                                                               "descriptionResourceKey":  "mediaContentRatingTVDescription",
                                                                                                                                               "childSettings":  [
@@ -1478,12 +1495,12 @@
                                                                                                                                               "entityKey":  "tvRating",
                                                                                                                                               "booleanActions":  0,
                                                                                                                                               "defaultValue":  "allAllowed",
-                                                                                                                                              "policyType":  45,
+                                                                                                                                              "policyType":  46,
                                                                                                                                               "enabled":  true
                                                                                                                                           }
                                                                                                                                       ],
                                                                                                                    "dataType":  6,
-                                                                                                                   "category":  7,
+                                                                                                                   "category":  8,
                                                                                                                    "nameResourceKey":  "mediaContentRatingUnitedKingdomName",
                                                                                                                    "descriptionResourceKey":  "empty",
                                                                                                                    "childSettings":  [
@@ -1494,12 +1511,12 @@
                                                                                                                                ],
                                                                                                                    "entityKey":  "mediaContentRatingUnitedKingdom",
                                                                                                                    "booleanActions":  0,
-                                                                                                                   "policyType":  45,
+                                                                                                                   "policyType":  46,
                                                                                                                    "enabled":  true
                                                                                                                },
                                                                                                                {
                                                                                                                    "dataType":  16,
-                                                                                                                   "category":  7,
+                                                                                                                   "category":  8,
                                                                                                                    "nameResourceKey":  "mediaContentRatingAppsName",
                                                                                                                    "descriptionResourceKey":  "mediaContentRatingAppsDescription",
                                                                                                                    "childSettings":  [
@@ -1541,7 +1558,7 @@
                                                                                                                    "booleanActions":  0,
                                                                                                                    "defaultValue":  "allAllowed",
                                                                                                                    "unconfiguredValue":  "allAllowed",
-                                                                                                                   "policyType":  45,
+                                                                                                                   "policyType":  46,
                                                                                                                    "enabled":  true
                                                                                                                }
                                                                                                            ],
@@ -1555,7 +1572,7 @@
                                                                                                                    "complexOptions":  [
                                                                                                                                           {
                                                                                                                                               "dataType":  16,
-                                                                                                                                              "category":  7,
+                                                                                                                                              "category":  8,
                                                                                                                                               "nameResourceKey":  "mediaContentRatingMoviesName",
                                                                                                                                               "descriptionResourceKey":  "mediaContentRatingMoviesDescription",
                                                                                                                                               "childSettings":  [
@@ -1601,12 +1618,12 @@
                                                                                                                                               "entityKey":  "movieRating",
                                                                                                                                               "booleanActions":  0,
                                                                                                                                               "defaultValue":  "allAllowed",
-                                                                                                                                              "policyType":  45,
+                                                                                                                                              "policyType":  46,
                                                                                                                                               "enabled":  true
                                                                                                                                           },
                                                                                                                                           {
                                                                                                                                               "dataType":  16,
-                                                                                                                                              "category":  7,
+                                                                                                                                              "category":  8,
                                                                                                                                               "nameResourceKey":  "mediaContentRatingTVName",
                                                                                                                                               "descriptionResourceKey":  "mediaContentRatingTVDescription",
                                                                                                                                               "childSettings":  [
@@ -1657,12 +1674,12 @@
                                                                                                                                               "entityKey":  "tvRating",
                                                                                                                                               "booleanActions":  0,
                                                                                                                                               "defaultValue":  "allAllowed",
-                                                                                                                                              "policyType":  45,
+                                                                                                                                              "policyType":  46,
                                                                                                                                               "enabled":  true
                                                                                                                                           }
                                                                                                                                       ],
                                                                                                                    "dataType":  6,
-                                                                                                                   "category":  7,
+                                                                                                                   "category":  8,
                                                                                                                    "nameResourceKey":  "mediaContentRatingUnitedStatesName",
                                                                                                                    "descriptionResourceKey":  "empty",
                                                                                                                    "childSettings":  [
@@ -1673,12 +1690,12 @@
                                                                                                                                ],
                                                                                                                    "entityKey":  "mediaContentRatingUnitedStates",
                                                                                                                    "booleanActions":  0,
-                                                                                                                   "policyType":  45,
+                                                                                                                   "policyType":  46,
                                                                                                                    "enabled":  true
                                                                                                                },
                                                                                                                {
                                                                                                                    "dataType":  16,
-                                                                                                                   "category":  7,
+                                                                                                                   "category":  8,
                                                                                                                    "nameResourceKey":  "mediaContentRatingAppsName",
                                                                                                                    "descriptionResourceKey":  "mediaContentRatingAppsDescription",
                                                                                                                    "childSettings":  [
@@ -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,26 +1756,26 @@
 
                                                             ],
                                                 "booleanActions":  0,
-                                                "policyType":  45,
+                                                "policyType":  46,
                                                 "enabled":  true
                                             },
                                             {
                                                 "isSettingDescription":  false,
                                                 "showAsSectionHeader":  true,
                                                 "dataType":  8,
-                                                "category":  7,
+                                                "category":  8,
                                                 "nameResourceKey":  "automatedDeviceEnrollmentHeaderName",
                                                 "descriptionResourceKey":  "automatedDeviceEnrollmentHeaderDescription",
                                                 "childSettings":  [
                                                                       {
                                                                           "dataType":  0,
-                                                                          "category":  7,
+                                                                          "category":  8,
                                                                           "nameResourceKey":  "blockAppStoreName",
                                                                           "descriptionResourceKey":  "blockAppStoreDescription",
                                                                           "childSettings":  [
                                                                                                 {
                                                                                                     "dataType":  0,
-                                                                                                    "category":  7,
+                                                                                                    "category":  8,
                                                                                                     "nameResourceKey":  "blockAppStoreUIAppInstallationName",
                                                                                                     "descriptionResourceKey":  "blockAppStoreUIAppInstallationDescription",
                                                                                                     "childSettings":  [
@@ -1770,12 +1787,12 @@
                                                                                                     "entityKey":  "appStoreBlockUIAppInstallation",
                                                                                                     "booleanActions":  9,
                                                                                                     "defaultValue":  false,
-                                                                                                    "policyType":  45,
+                                                                                                    "policyType":  46,
                                                                                                     "enabled":  true
                                                                                                 },
                                                                                                 {
                                                                                                     "dataType":  0,
-                                                                                                    "category":  7,
+                                                                                                    "category":  8,
                                                                                                     "nameResourceKey":  "blockAppStoreAutomaticDownloadsName",
                                                                                                     "descriptionResourceKey":  "blockAppStoreAutomaticDownloadsDescription",
                                                                                                     "childSettings":  [
@@ -1787,7 +1804,7 @@
                                                                                                     "entityKey":  "appStoreBlockAutomaticDownloads",
                                                                                                     "booleanActions":  9,
                                                                                                     "defaultValue":  false,
-                                                                                                    "policyType":  45,
+                                                                                                    "policyType":  46,
                                                                                                     "enabled":  true
                                                                                                 }
                                                                                             ],
@@ -1797,12 +1814,12 @@
                                                                           "entityKey":  "appStoreBlocked",
                                                                           "booleanActions":  9,
                                                                           "defaultValue":  false,
-                                                                          "policyType":  45,
+                                                                          "policyType":  46,
                                                                           "enabled":  true
                                                                       },
                                                                       {
                                                                           "dataType":  0,
-                                                                          "category":  7,
+                                                                          "category":  8,
                                                                           "nameResourceKey":  "blockAdultContentInItunesName",
                                                                           "descriptionResourceKey":  "blockAdultContentInItunesDescription",
                                                                           "childSettings":  [
@@ -1814,12 +1831,12 @@
                                                                           "entityKey":  "iTunesBlockExplicitContent",
                                                                           "booleanActions":  9,
                                                                           "defaultValue":  false,
-                                                                          "policyType":  45,
+                                                                          "policyType":  46,
                                                                           "enabled":  true
                                                                       },
                                                                       {
                                                                           "dataType":  0,
-                                                                          "category":  7,
+                                                                          "category":  8,
                                                                           "nameResourceKey":  "blockGameCenterFriendsName",
                                                                           "descriptionResourceKey":  "blockGameCenterFriendsDescription",
                                                                           "childSettings":  [
@@ -1831,12 +1848,12 @@
                                                                           "entityKey":  "gamingBlockGameCenterFriends",
                                                                           "booleanActions":  9,
                                                                           "defaultValue":  false,
-                                                                          "policyType":  45,
+                                                                          "policyType":  46,
                                                                           "enabled":  true
                                                                       },
                                                                       {
                                                                           "dataType":  0,
-                                                                          "category":  7,
+                                                                          "category":  8,
                                                                           "nameResourceKey":  "blockGameCenterName",
                                                                           "childSettings":  [
 
@@ -1847,12 +1864,12 @@
                                                                           "entityKey":  "gameCenterBlocked",
                                                                           "booleanActions":  9,
                                                                           "defaultValue":  false,
-                                                                          "policyType":  45,
+                                                                          "policyType":  46,
                                                                           "enabled":  true
                                                                       },
                                                                       {
                                                                           "dataType":  0,
-                                                                          "category":  7,
+                                                                          "category":  8,
                                                                           "nameResourceKey":  "blockMultiplayerGamingName",
                                                                           "descriptionResourceKey":  "blockMultiplayerGamingDescription",
                                                                           "childSettings":  [
@@ -1864,12 +1881,12 @@
                                                                           "entityKey":  "gamingBlockMultiplayer",
                                                                           "booleanActions":  9,
                                                                           "defaultValue":  false,
-                                                                          "policyType":  45,
+                                                                          "policyType":  46,
                                                                           "enabled":  true
                                                                       },
                                                                       {
                                                                           "dataType":  0,
-                                                                          "category":  7,
+                                                                          "category":  8,
                                                                           "nameResourceKey":  "blockFilesNetworkDriveAccessName",
                                                                           "descriptionResourceKey":  "blockFilesNetworkDriveAccessDescription",
                                                                           "childSettings":  [
@@ -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":  8,
+                                            "nameResourceKey":  "automatedDeviceEnrollmentHeaderNameMac",
+                                            "descriptionResourceKey":  "automatedDeviceEnrollmentHeaderDescriptionMac",
+                                            "childSettings":  [
+                                                                  {
+                                                                      "dataType":  0,
+                                                                      "category":  8,
+                                                                      "nameResourceKey":  "addingGameCenterFriendsBlockedMacName",
+                                                                      "descriptionResourceKey":  "addingGameCenterFriendsBlockedMacDescription",
+                                                                      "childSettings":  [
+
+                                                                                        ],
+                                                                      "options":  [
+
+                                                                                  ],
+                                                                      "entityKey":  "addingGameCenterFriendsBlocked",
+                                                                      "booleanActions":  9,
+                                                                      "defaultValue":  false,
+                                                                      "policyType":  61,
+                                                                      "enabled":  true
+                                                                  },
+                                                                  {
+                                                                      "dataType":  0,
+                                                                      "category":  8,
+                                                                      "nameResourceKey":  "gameCenterBlockedMacName",
+                                                                      "descriptionResourceKey":  "gameCenterBlockedMacDescription",
+                                                                      "childSettings":  [
+
+                                                                                        ],
+                                                                      "options":  [
+
+                                                                                  ],
+                                                                      "entityKey":  "gameCenterBlocked",
+                                                                      "booleanActions":  9,
+                                                                      "defaultValue":  false,
+                                                                      "policyType":  61,
+                                                                      "enabled":  true
+                                                                  },
+                                                                  {
+                                                                      "dataType":  0,
+                                                                      "category":  8,
+                                                                      "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/applicationsandgoogle_androidgeneral.json

@@ -1,7 +1,7 @@
-{
+{
     "applicationsandgoogle_androidgeneral":  {
                                                  "dataType":  0,
-                                                 "category":  8,
+                                                 "category":  9,
                                                  "nameResourceKey":  "blockGooglePlayStoreName",
                                                  "descriptionResourceKey":  "blockGooglePlayStoreDescription",
                                                  "childSettings":  [

Documentation/ObjectInfo/applicationvisibility_iosgeneral.json

@@ -1,10 +1,10 @@
-{
+{
     "applicationvisibility_iosgeneral":  [
                                              {
                                                  "isSettingDescription":  false,
                                                  "showAsSectionHeader":  false,
                                                  "dataType":  8,
-                                                 "category":  5,
+                                                 "category":  6,
                                                  "nameResourceKey":  "IosGeneralApplicationVisibilityHeader",
                                                  "childSettings":  [
 
@@ -13,20 +13,20 @@
 
                                                              ],
                                                  "booleanActions":  0,
-                                                 "policyType":  45,
+                                                 "policyType":  46,
                                                  "enabled":  true
                                              },
                                              {
                                                  "isSettingDescription":  false,
                                                  "showAsSectionHeader":  true,
                                                  "dataType":  8,
-                                                 "category":  5,
+                                                 "category":  6,
                                                  "nameResourceKey":  "automatedDeviceEnrollmentHeaderName",
                                                  "descriptionResourceKey":  "automatedDeviceEnrollmentHeaderDescription",
                                                  "childSettings":  [
                                                                        {
                                                                            "dataType":  16,
-                                                                           "category":  5,
+                                                                           "category":  6,
                                                                            "nameResourceKey":  "visibleAppsListOptionsName",
                                                                            "descriptionResourceKey":  "visibleAppsListOptionsDescription",
                                                                            "childSettings":  [
@@ -35,7 +35,7 @@
                                                                                                                      {
                                                                                                                          "metadata":  {
                                                                                                                                           "dataType":  20,
-                                                                                                                                          "category":  5,
+                                                                                                                                          "category":  6,
                                                                                                                                           "nameResourceKey":  "appUrlName",
                                                                                                                                           "descriptionResourceKey":  "empty",
                                                                                                                                           "emptyValueResourceKey":  "kioskModeAppStoreExample",
@@ -47,14 +47,14 @@
                                                                                                                                                       ],
                                                                                                                                           "entityKey":  "appStoreUrl",
                                                                                                                                           "booleanActions":  0,
-                                                                                                                                          "policyType":  45,
+                                                                                                                                          "policyType":  46,
                                                                                                                                           "enabled":  true
                                                                                                                                       }
                                                                                                                      },
                                                                                                                      {
                                                                                                                          "metadata":  {
                                                                                                                                           "dataType":  20,
-                                                                                                                                          "category":  5,
+                                                                                                                                          "category":  6,
                                                                                                                                           "nameResourceKey":  "appBundleIdColumn",
                                                                                                                                           "descriptionResourceKey":  "empty",
                                                                                                                                           "emptyValueResourceKey":  "bundleIdExample",
@@ -66,14 +66,14 @@
                                                                                                                                                       ],
                                                                                                                                           "entityKey":  "appId",
                                                                                                                                           "booleanActions":  0,
-                                                                                                                                          "policyType":  45,
+                                                                                                                                          "policyType":  46,
                                                                                                                                           "enabled":  true
                                                                                                                                       }
                                                                                                                      },
                                                                                                                      {
                                                                                                                          "metadata":  {
                                                                                                                                           "dataType":  20,
-                                                                                                                                          "category":  5,
+                                                                                                                                          "category":  6,
                                                                                                                                           "nameResourceKey":  "appNameName",
                                                                                                                                           "descriptionResourceKey":  "empty",
                                                                                                                                           "childSettings":  [
@@ -84,14 +84,14 @@
                                                                                                                                                       ],
                                                                                                                                           "entityKey":  "name",
                                                                                                                                           "booleanActions":  0,
-                                                                                                                                          "policyType":  45,
+                                                                                                                                          "policyType":  46,
                                                                                                                                           "enabled":  true
                                                                                                                                       }
                                                                                                                      },
                                                                                                                      {
                                                                                                                          "metadata":  {
                                                                                                                                           "dataType":  20,
-                                                                                                                                          "category":  5,
+                                                                                                                                          "category":  6,
                                                                                                                                           "nameResourceKey":  "appPublisherName",
                                                                                                                                           "descriptionResourceKey":  "empty",
                                                                                                                                           "childSettings":  [
@@ -102,13 +102,13 @@
                                                                                                                                                       ],
                                                                                                                                           "entityKey":  "publisher",
                                                                                                                                           "booleanActions":  0,
-                                                                                                                                          "policyType":  45,
+                                                                                                                                          "policyType":  46,
                                                                                                                                           "enabled":  true
                                                                                                                                       }
                                                                                                                      }
                                                                                                                  ],
                                                                                                      "dataType":  21,
-                                                                                                     "category":  5,
+                                                                                                     "category":  6,
                                                                                                      "nameResourceKey":  "appListTableName",
                                                                                                      "descriptionResourceKey":  "iosAppUrlHelp",
                                                                                                      "childSettings":  [
@@ -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/appmanagement_androidgeneral.json

@@ -1,10 +1,10 @@
-{
+{
     "appmanagement_androidgeneral":  [
                                          {
                                              "isSettingDescription":  false,
                                              "showAsSectionHeader":  false,
                                              "dataType":  8,
-                                             "category":  9,
+                                             "category":  10,
                                              "nameResourceKey":  "androidAppManagementHeaderName",
                                              "childSettings":  [
 
@@ -18,7 +18,7 @@
                                          },
                                          {
                                              "dataType":  9,
-                                             "category":  9,
+                                             "category":  10,
                                              "childSettings":  [
                                                                    {
                                                                        "complexOptions":  [
@@ -26,7 +26,7 @@
                                                                                                   "isSettingDescription":  false,
                                                                                                   "showAsSectionHeader":  false,
                                                                                                   "dataType":  8,
-                                                                                                  "category":  9,
+                                                                                                  "category":  10,
                                                                                                   "nameResourceKey":  "androidAppsAllowedToBeInstalledtHeaderName",
                                                                                                   "childSettings":  [
 
@@ -43,7 +43,7 @@
                                                                                                                   {
                                                                                                                       "metadata":  {
                                                                                                                                        "dataType":  20,
-                                                                                                                                       "category":  9,
+                                                                                                                                       "category":  10,
                                                                                                                                        "nameResourceKey":  "singleAppModeAppNameName",
                                                                                                                                        "descriptionResourceKey":  "Empty",
                                                                                                                                        "childSettings":  [
@@ -61,7 +61,7 @@
                                                                                                                   {
                                                                                                                       "metadata":  {
                                                                                                                                        "dataType":  20,
-                                                                                                                                       "category":  9,
+                                                                                                                                       "category":  10,
                                                                                                                                        "nameResourceKey":  "packageName",
                                                                                                                                        "descriptionResourceKey":  "Empty",
                                                                                                                                        "childSettings":  [
@@ -79,7 +79,7 @@
                                                                                                                   {
                                                                                                                       "metadata":  {
                                                                                                                                        "dataType":  20,
-                                                                                                                                       "category":  9,
+                                                                                                                                       "category":  10,
                                                                                                                                        "nameResourceKey":  "appUrlName",
                                                                                                                                        "descriptionResourceKey":  "Empty",
                                                                                                                                        "childSettings":  [
@@ -97,7 +97,7 @@
                                                                                                                   {
                                                                                                                       "metadata":  {
                                                                                                                                        "dataType":  20,
-                                                                                                                                       "category":  9,
+                                                                                                                                       "category":  10,
                                                                                                                                        "nameResourceKey":  "appPublisherName",
                                                                                                                                        "descriptionResourceKey":  "Empty",
                                                                                                                                        "childSettings":  [
@@ -114,7 +114,7 @@
                                                                                                                   }
                                                                                                               ],
                                                                                                   "dataType":  21,
-                                                                                                  "category":  9,
+                                                                                                  "category":  10,
                                                                                                   "nameResourceKey":  "Empty",
                                                                                                   "descriptionResourceKey":  "Empty",
                                                                                                   "childSettings":  [
@@ -130,7 +130,7 @@
                                                                                               }
                                                                                           ],
                                                                        "dataType":  5,
-                                                                       "category":  9,
+                                                                       "category":  10,
                                                                        "nameResourceKey":  "androidAppsAllowedToBeInstalled",
                                                                        "childSettings":  [
 
@@ -148,7 +148,7 @@
                                                                                                   "isSettingDescription":  false,
                                                                                                   "showAsSectionHeader":  false,
                                                                                                   "dataType":  8,
-                                                                                                  "category":  9,
+                                                                                                  "category":  10,
                                                                                                   "nameResourceKey":  "androidAppsBlockedFromLaunchHeaderName",
                                                                                                   "childSettings":  [
 
@@ -165,7 +165,7 @@
                                                                                                                   {
                                                                                                                       "metadata":  {
                                                                                                                                        "dataType":  20,
-                                                                                                                                       "category":  9,
+                                                                                                                                       "category":  10,
                                                                                                                                        "nameResourceKey":  "singleAppModeAppNameName",
                                                                                                                                        "descriptionResourceKey":  "Empty",
                                                                                                                                        "childSettings":  [
@@ -183,7 +183,7 @@
                                                                                                                   {
                                                                                                                       "metadata":  {
                                                                                                                                        "dataType":  20,
-                                                                                                                                       "category":  9,
+                                                                                                                                       "category":  10,
                                                                                                                                        "nameResourceKey":  "packageName",
                                                                                                                                        "descriptionResourceKey":  "Empty",
                                                                                                                                        "childSettings":  [
@@ -201,7 +201,7 @@
                                                                                                                   {
                                                                                                                       "metadata":  {
                                                                                                                                        "dataType":  20,
-                                                                                                                                       "category":  9,
+                                                                                                                                       "category":  10,
                                                                                                                                        "nameResourceKey":  "appUrlName",
                                                                                                                                        "descriptionResourceKey":  "Empty",
                                                                                                                                        "childSettings":  [
@@ -219,7 +219,7 @@
                                                                                                                   {
                                                                                                                       "metadata":  {
                                                                                                                                        "dataType":  20,
-                                                                                                                                       "category":  9,
+                                                                                                                                       "category":  10,
                                                                                                                                        "nameResourceKey":  "appPublisherName",
                                                                                                                                        "descriptionResourceKey":  "Empty",
                                                                                                                                        "childSettings":  [
@@ -236,7 +236,7 @@
                                                                                                                   }
                                                                                                               ],
                                                                                                   "dataType":  21,
-                                                                                                  "category":  9,
+                                                                                                  "category":  10,
                                                                                                   "nameResourceKey":  "Empty",
                                                                                                   "descriptionResourceKey":  "Empty",
                                                                                                   "childSettings":  [
@@ -252,7 +252,7 @@
                                                                                               }
                                                                                           ],
                                                                        "dataType":  5,
-                                                                       "category":  9,
+                                                                       "category":  10,
                                                                        "nameResourceKey":  "androidAppsBlockedFromLaunch",
                                                                        "childSettings":  [
 
@@ -270,7 +270,7 @@
                                                                                                   "isSettingDescription":  false,
                                                                                                   "showAsSectionHeader":  false,
                                                                                                   "dataType":  8,
-                                                                                                  "category":  9,
+                                                                                                  "category":  10,
                                                                                                   "nameResourceKey":  "androidHiddenAppsHeaderName",
                                                                                                   "childSettings":  [
 
@@ -287,7 +287,7 @@
                                                                                                                   {
                                                                                                                       "metadata":  {
                                                                                                                                        "dataType":  20,
-                                                                                                                                       "category":  9,
+                                                                                                                                       "category":  10,
                                                                                                                                        "nameResourceKey":  "singleAppModeAppNameName",
                                                                                                                                        "descriptionResourceKey":  "Empty",
                                                                                                                                        "childSettings":  [
@@ -305,7 +305,7 @@
                                                                                                                   {
                                                                                                                       "metadata":  {
                                                                                                                                        "dataType":  20,
-                                                                                                                                       "category":  9,
+                                                                                                                                       "category":  10,
                                                                                                                                        "nameResourceKey":  "packageName",
                                                                                                                                        "descriptionResourceKey":  "Empty",
                                                                                                                                        "childSettings":  [
@@ -323,7 +323,7 @@
                                                                                                                   {
                                                                                                                       "metadata":  {
                                                                                                                                        "dataType":  20,
-                                                                                                                                       "category":  9,
+                                                                                                                                       "category":  10,
                                                                                                                                        "nameResourceKey":  "appUrlName",
                                                                                                                                        "descriptionResourceKey":  "Empty",
                                                                                                                                        "childSettings":  [
@@ -341,7 +341,7 @@
                                                                                                                   {
                                                                                                                       "metadata":  {
                                                                                                                                        "dataType":  20,
-                                                                                                                                       "category":  9,
+                                                                                                                                       "category":  10,
                                                                                                                                        "nameResourceKey":  "appPublisherName",
                                                                                                                                        "descriptionResourceKey":  "Empty",
                                                                                                                                        "childSettings":  [
@@ -358,7 +358,7 @@
                                                                                                                   }
                                                                                                               ],
                                                                                                   "dataType":  21,
-                                                                                                  "category":  9,
+                                                                                                  "category":  10,
                                                                                                   "nameResourceKey":  "Empty",
                                                                                                   "descriptionResourceKey":  "Empty",
                                                                                                   "childSettings":  [
@@ -374,7 +374,7 @@
                                                                                               }
                                                                                           ],
                                                                        "dataType":  5,
-                                                                       "category":  9,
+                                                                       "category":  10,
                                                                        "nameResourceKey":  "androidHiddenApps",
                                                                        "childSettings":  [
 

Documentation/ObjectInfo/appsandexperience_windows10teamgeneral.json

@@ -1,8 +1,8 @@
-{
+{
     "appsandexperience_windows10teamgeneral":  [
                                                    {
                                                        "dataType":  0,
-                                                       "category":  10,
+                                                       "category":  11,
                                                        "nameResourceKey":  "wakeScreenWhenSomeoneInRoomName",
                                                        "descriptionResourceKey":  "empty",
                                                        "childSettings":  [
@@ -14,12 +14,12 @@
                                                        "entityKey":  "welcomeScreenBlockAutomaticWakeUp",
                                                        "booleanActions":  3,
                                                        "defaultValue":  false,
-                                                       "policyType":  86,
+                                                       "policyType":  87,
                                                        "enabled":  true
                                                    },
                                                    {
                                                        "dataType":  16,
-                                                       "category":  10,
+                                                       "category":  11,
                                                        "nameResourceKey":  "meetingInformationDisplayedOnWelcomeScreenName",
                                                        "descriptionResourceKey":  "empty",
                                                        "childSettings":  [
@@ -46,12 +46,12 @@
                                                        "booleanActions":  0,
                                                        "defaultValue":  "userDefined",
                                                        "unconfiguredValue":  "userDefined",
-                                                       "policyType":  86,
+                                                       "policyType":  87,
                                                        "enabled":  true
                                                    },
                                                    {
                                                        "dataType":  20,
-                                                       "category":  10,
+                                                       "category":  11,
                                                        "nameResourceKey":  "lockScreenBackgroundImageURLName",
                                                        "descriptionResourceKey":  "lockScreenBackgroundImageURLDescription",
                                                        "emptyValueResourceKey":  "lockScreenBackgroundImageURLExample",
@@ -63,12 +63,12 @@
                                                                    ],
                                                        "entityKey":  "welcomeScreenBackgroundImageUrl",
                                                        "booleanActions":  0,
-                                                       "policyType":  86,
+                                                       "policyType":  87,
                                                        "enabled":  true
                                                    },
                                                    {
                                                        "dataType":  0,
-                                                       "category":  10,
+                                                       "category":  11,
                                                        "nameResourceKey":  "connectAppBlockAutoLaunchName",
                                                        "descriptionResourceKey":  "connectAppBlockAutoLaunchDescription",
                                                        "childSettings":  [
@@ -80,12 +80,12 @@
                                                        "entityKey":  "connectAppBlockAutoLaunch",
                                                        "booleanActions":  3,
                                                        "defaultValue":  false,
-                                                       "policyType":  86,
+                                                       "policyType":  87,
                                                        "enabled":  true
                                                    },
                                                    {
                                                        "dataType":  0,
-                                                       "category":  10,
+                                                       "category":  11,
                                                        "nameResourceKey":  "settingsBlockSigninSuggestionsName",
                                                        "descriptionResourceKey":  "settingsBlockSigninSuggestionsDescription",
                                                        "childSettings":  [
@@ -97,12 +97,12 @@
                                                        "entityKey":  "settingsBlockSigninSuggestions",
                                                        "booleanActions":  3,
                                                        "defaultValue":  false,
-                                                       "policyType":  86,
+                                                       "policyType":  87,
                                                        "enabled":  true
                                                    },
                                                    {
                                                        "dataType":  0,
-                                                       "category":  10,
+                                                       "category":  11,
                                                        "nameResourceKey":  "settingsBlockMyMeetingsAndFilesName",
                                                        "descriptionResourceKey":  "settingsBlockMyMeetingsAndFilesDescription",
                                                        "childSettings":  [
@@ -114,7 +114,7 @@
                                                        "entityKey":  "settingsBlockMyMeetingsAndFiles",
                                                        "booleanActions":  3,
                                                        "defaultValue":  false,
-                                                       "policyType":  86,
+                                                       "policyType":  87,
                                                        "enabled":  true
                                                    }
                                                ]

Documentation/ObjectInfo/associateddomains_macdevicefeatures.json

@@ -1,10 +1,10 @@
-{
+{
     "associateddomains_macdevicefeatures":  [
                                                 {
                                                     "isSettingDescription":  false,
                                                     "showAsSectionHeader":  false,
                                                     "dataType":  8,
-                                                    "category":  11,
+                                                    "category":  12,
                                                     "nameResourceKey":  "MacDeviceFeaturesAssociatedDomainsHeader",
                                                     "childSettings":  [
 
@@ -13,14 +13,14 @@
 
                                                                 ],
                                                     "booleanActions":  0,
-                                                    "policyType":  57,
+                                                    "policyType":  58,
                                                     "enabled":  true
                                                 },
                                                 {
                                                     "isSettingDescription":  false,
                                                     "showAsSectionHeader":  true,
                                                     "dataType":  8,
-                                                    "category":  11,
+                                                    "category":  12,
                                                     "nameResourceKey":  "userApprovedAndAutomatedDeviceEnrollmentHeaderNameMac",
                                                     "descriptionResourceKey":  "userApprovedAndAutomatedDeviceEnrollmentHeaderDescriptionMac",
                                                     "childSettings":  [
@@ -29,7 +29,7 @@
                                                                                               {
                                                                                                   "metadata":  {
                                                                                                                    "dataType":  20,
-                                                                                                                   "category":  11,
+                                                                                                                   "category":  12,
                                                                                                                    "nameResourceKey":  "associatedDomainsAppIdName",
                                                                                                                    "descriptionResourceKey":  "associatedDomainsAppIdDescription",
                                                                                                                    "emptyValueResourceKey":  "associatedDomainsAppIdExample",
@@ -41,7 +41,7 @@
                                                                                                                                ],
                                                                                                                    "entityKey":  "applicationIdentifier",
                                                                                                                    "booleanActions":  0,
-                                                                                                                   "policyType":  57,
+                                                                                                                   "policyType":  58,
                                                                                                                    "enabled":  true
                                                                                                                }
                                                                                               },
@@ -51,7 +51,7 @@
                                                                                                                                    {
                                                                                                                                        "metadata":  {
                                                                                                                                                         "dataType":  20,
-                                                                                                                                                        "category":  11,
+                                                                                                                                                        "category":  12,
                                                                                                                                                         "nameResourceKey":  "associatedDomainsDomainName",
                                                                                                                                                         "emptyValueResourceKey":  "associatedDomainsDomainExample",
                                                                                                                                                         "childSettings":  [
@@ -62,13 +62,13 @@
                                                                                                                                                                     ],
                                                                                                                                                         "entityKey":  "domains",
                                                                                                                                                         "booleanActions":  0,
-                                                                                                                                                        "policyType":  57,
+                                                                                                                                                        "policyType":  58,
                                                                                                                                                         "enabled":  true
                                                                                                                                                     }
                                                                                                                                    }
                                                                                                                                ],
                                                                                                                    "dataType":  21,
-                                                                                                                   "category":  11,
+                                                                                                                   "category":  12,
                                                                                                                    "nameResourceKey":  "associatedDomainsDomainsListName",
                                                                                                                    "descriptionResourceKey":  "associatedDomainsDomainsListDescription",
                                                                                                                    "childSettings":  [
@@ -79,14 +79,14 @@
                                                                                                                                ],
                                                                                                                    "entityKey":  "domains",
                                                                                                                    "booleanActions":  0,
-                                                                                                                   "policyType":  57,
+                                                                                                                   "policyType":  58,
                                                                                                                    "enabled":  true
                                                                                                                }
                                                                                               },
                                                                                               {
                                                                                                   "metadata":  {
                                                                                                                    "dataType":  0,
-                                                                                                                   "category":  11,
+                                                                                                                   "category":  12,
                                                                                                                    "nameResourceKey":  "associatedDomainsEnableDirectDownloadsName",
                                                                                                                    "descriptionResourceKey":  "associatedDomainsEnableDirectDownloadsDescription",
                                                                                                                    "childSettings":  [
@@ -98,13 +98,13 @@
                                                                                                                    "entityKey":  "directDownloadsEnabled",
                                                                                                                    "booleanActions":  9,
                                                                                                                    "defaultValue":  false,
-                                                                                                                   "policyType":  57,
+                                                                                                                   "policyType":  58,
                                                                                                                    "enabled":  true
                                                                                                                }
                                                                                               }
                                                                                           ],
                                                                               "dataType":  21,
-                                                                              "category":  11,
+                                                                              "category":  12,
                                                                               "nameResourceKey":  "associatedDomainsTableName",
                                                                               "descriptionResourceKey":  "associatedDomainsTableDescription",
                                                                               "childSettings":  [
@@ -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

@@ -1,10 +1,10 @@
-{
+{
     "autonomoussingleappmode_iosgeneral":  [
                                                {
                                                    "isSettingDescription":  false,
                                                    "showAsSectionHeader":  false,
                                                    "dataType":  8,
-                                                   "category":  12,
+                                                   "category":  13,
                                                    "nameResourceKey":  "IosGeneralAutonomousSingleAppModeHeader",
                                                    "childSettings":  [
 
@@ -13,14 +13,14 @@
 
                                                                ],
                                                    "booleanActions":  0,
-                                                   "policyType":  45,
+                                                   "policyType":  46,
                                                    "enabled":  true
                                                },
                                                {
                                                    "isSettingDescription":  false,
                                                    "showAsSectionHeader":  true,
                                                    "dataType":  8,
-                                                   "category":  12,
+                                                   "category":  13,
                                                    "nameResourceKey":  "automatedDeviceEnrollmentHeaderName",
                                                    "descriptionResourceKey":  "automatedDeviceEnrollmentHeaderDescription",
                                                    "childSettings":  [
@@ -29,7 +29,7 @@
                                                                                              {
                                                                                                  "metadata":  {
                                                                                                                   "dataType":  20,
-                                                                                                                  "category":  12,
+                                                                                                                  "category":  13,
                                                                                                                   "nameResourceKey":  "singleAppModeAppNameName",
                                                                                                                   "descriptionResourceKey":  "singleAppModeAppNameDescription",
                                                                                                                   "childSettings":  [
@@ -40,14 +40,14 @@
                                                                                                                               ],
                                                                                                                   "entityKey":  "name",
                                                                                                                   "booleanActions":  0,
-                                                                                                                  "policyType":  45,
+                                                                                                                  "policyType":  46,
                                                                                                                   "enabled":  true
                                                                                                               }
                                                                                              },
                                                                                              {
                                                                                                  "metadata":  {
                                                                                                                   "dataType":  20,
-                                                                                                                  "category":  12,
+                                                                                                                  "category":  13,
                                                                                                                   "nameResourceKey":  "singleAppModeBundleIdsName",
                                                                                                                   "descriptionResourceKey":  "singleAppModeBundleIdsDescription",
                                                                                                                   "childSettings":  [
@@ -58,13 +58,13 @@
                                                                                                                               ],
                                                                                                                   "entityKey":  "appId",
                                                                                                                   "booleanActions":  0,
-                                                                                                                  "policyType":  45,
+                                                                                                                  "policyType":  46,
                                                                                                                   "enabled":  true
                                                                                                               }
                                                                                              }
                                                                                          ],
                                                                              "dataType":  21,
-                                                                             "category":  12,
+                                                                             "category":  13,
                                                                              "nameResourceKey":  "Empty",
                                                                              "descriptionResourceKey":  "Empty",
                                                                              "childSettings":  [
@@ -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

@@ -1,13 +1,13 @@
-{
+{
     "azureoperationalinsights_windows10teamgeneral":  {
                                                           "dataType":  0,
-                                                          "category":  13,
+                                                          "category":  14,
                                                           "nameResourceKey":  "azureOperationalInsightsName",
                                                           "descriptionResourceKey":  "azureOperationalInsightsDescription",
                                                           "childSettings":  [
                                                                                 {
                                                                                     "dataType":  20,
-                                                                                    "category":  13,
+                                                                                    "category":  14,
                                                                                     "nameResourceKey":  "workspaceIDName",
                                                                                     "descriptionResourceKey":  "empty",
                                                                                     "childSettings":  [
@@ -18,12 +18,12 @@
                                                                                                 ],
                                                                                     "entityKey":  "azureOperationalInsightsWorkspaceId",
                                                                                     "booleanActions":  0,
-                                                                                    "policyType":  86,
+                                                                                    "policyType":  87,
                                                                                     "enabled":  true
                                                                                 },
                                                                                 {
                                                                                     "dataType":  20,
-                                                                                    "category":  13,
+                                                                                    "category":  14,
                                                                                     "nameResourceKey":  "workspaceKeyName",
                                                                                     "descriptionResourceKey":  "empty",
                                                                                     "childSettings":  [
@@ -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

@@ -1,10 +1,10 @@
-{
+{
     "bitlocker_windows10endpointprotection":  [
                                                   {
                                                       "isSettingDescription":  false,
                                                       "showAsSectionHeader":  false,
                                                       "dataType":  8,
-                                                      "category":  14,
+                                                      "category":  15,
                                                       "nameResourceKey":  "bitLockerWindowsSettingsName",
                                                       "descriptionResourceKey":  "bitLockerWindowsSettingsDescription",
                                                       "childSettings":  [
@@ -14,12 +14,12 @@
 
                                                                   ],
                                                       "booleanActions":  0,
-                                                      "policyType":  76,
+                                                      "policyType":  77,
                                                       "enabled":  true
                                                   },
                                                   {
                                                       "dataType":  0,
-                                                      "category":  14,
+                                                      "category":  15,
                                                       "nameResourceKey":  "bitLockerEncryptDeviceName",
                                                       "descriptionResourceKey":  "bitLockerEncryptDeviceDescription",
                                                       "childSettings":  [
@@ -32,12 +32,12 @@
                                                       "booleanActions":  1,
                                                       "defaultValue":  false,
                                                       "unconfiguredValue":  false,
-                                                      "policyType":  76,
+                                                      "policyType":  77,
                                                       "enabled":  true
                                                   },
                                                   {
                                                       "dataType":  0,
-                                                      "category":  14,
+                                                      "category":  15,
                                                       "nameResourceKey":  "bitLockerEnableStorageCardEncryptionOnMobileName",
                                                       "descriptionResourceKey":  "bitLockerEnableStorageCardEncryptionOnMobileDescription",
                                                       "childSettings":  [
@@ -50,14 +50,14 @@
                                                       "booleanActions":  1,
                                                       "defaultValue":  false,
                                                       "unconfiguredValue":  false,
-                                                      "policyType":  76,
+                                                      "policyType":  77,
                                                       "enabled":  true
                                                   },
                                                   {
                                                       "isSettingDescription":  false,
                                                       "showAsSectionHeader":  false,
                                                       "dataType":  8,
-                                                      "category":  14,
+                                                      "category":  15,
                                                       "nameResourceKey":  "bitLockerBaseSettingsName",
                                                       "descriptionResourceKey":  "bitLockerBaseSettingsDescription",
                                                       "childSettings":  [
@@ -67,18 +67,18 @@
 
                                                                   ],
                                                       "booleanActions":  0,
-                                                      "policyType":  76,
+                                                      "policyType":  77,
                                                       "enabled":  true
                                                   },
                                                   {
                                                       "dataType":  0,
-                                                      "category":  14,
+                                                      "category":  15,
                                                       "nameResourceKey":  "bitLockerDisableWarningForOtherDiskEncryptionName",
                                                       "descriptionResourceKey":  "bitLockerDisableWarningForOtherDiskEncryptionDescription",
                                                       "childSettings":  [
                                                                             {
                                                                                 "dataType":  0,
-                                                                                "category":  14,
+                                                                                "category":  15,
                                                                                 "nameResourceKey":  "BitLockerAllowStdUsersEncryptAADJoinName",
                                                                                 "descriptionResourceKey":  "BitLockerAllowStdUsersEncryptAADJoinDescription",
                                                                                 "childSettings":  [
@@ -100,7 +100,7 @@
                                                                                 "booleanActions":  0,
                                                                                 "defaultValue":  false,
                                                                                 "unconfiguredValue":  false,
-                                                                                "policyType":  76,
+                                                                                "policyType":  77,
                                                                                 "enabled":  true
                                                                             }
                                                                         ],
@@ -111,18 +111,18 @@
                                                       "booleanActions":  3,
                                                       "defaultValue":  false,
                                                       "unconfiguredValue":  false,
-                                                      "policyType":  76,
+                                                      "policyType":  77,
                                                       "enabled":  true
                                                   },
                                                   {
                                                       "dataType":  0,
-                                                      "category":  14,
+                                                      "category":  15,
                                                       "nameResourceKey":  "bitLockerBaseConfigureEncryptionMethodsName",
                                                       "descriptionResourceKey":  "bitLockerBaseConfigureEncryptionMethodsDescription",
                                                       "childSettings":  [
                                                                             {
                                                                                 "dataType":  16,
-                                                                                "category":  14,
+                                                                                "category":  15,
                                                                                 "nameResourceKey":  "bitLockerSystemEncryptionMethodName",
                                                                                 "descriptionResourceKey":  "bitLockerXTSAESEncryptionMethodDescription",
                                                                                 "childSettings":  [
@@ -135,7 +135,7 @@
                                                                                                     "children":  [
                                                                                                                      {
                                                                                                                          "dataType":  10,
-                                                                                                                         "category":  14,
+                                                                                                                         "category":  15,
                                                                                                                          "nameResourceKey":  "bitlockerWarningInfoBox",
                                                                                                                          "childSettings":  [
 
@@ -144,7 +144,7 @@
 
                                                                                                                                      ],
                                                                                                                          "booleanActions":  0,
-                                                                                                                         "policyType":  76,
+                                                                                                                         "policyType":  77,
                                                                                                                          "enabled":  true
                                                                                                                      }
                                                                                                                  ],
@@ -156,7 +156,7 @@
                                                                                                     "children":  [
                                                                                                                      {
                                                                                                                          "dataType":  10,
-                                                                                                                         "category":  14,
+                                                                                                                         "category":  15,
                                                                                                                          "nameResourceKey":  "bitlockerWarningInfoBox",
                                                                                                                          "childSettings":  [
 
@@ -165,7 +165,7 @@
 
                                                                                                                                      ],
                                                                                                                          "booleanActions":  0,
-                                                                                                                         "policyType":  76,
+                                                                                                                         "policyType":  77,
                                                                                                                          "enabled":  true
                                                                                                                      }
                                                                                                                  ],
@@ -182,7 +182,7 @@
                                                                                                     "children":  [
                                                                                                                      {
                                                                                                                          "dataType":  10,
-                                                                                                                         "category":  14,
+                                                                                                                         "category":  15,
                                                                                                                          "nameResourceKey":  "bitlockerWarningInfoBox",
                                                                                                                          "childSettings":  [
 
@@ -191,7 +191,7 @@
 
                                                                                                                                      ],
                                                                                                                          "booleanActions":  0,
-                                                                                                                         "policyType":  76,
+                                                                                                                         "policyType":  77,
                                                                                                                          "enabled":  true
                                                                                                                      }
                                                                                                                  ],
@@ -202,12 +202,12 @@
                                                                                 "booleanActions":  0,
                                                                                 "defaultValue":  "xtsAes128",
                                                                                 "unconfiguredValue":  "xtsAes128",
-                                                                                "policyType":  76,
+                                                                                "policyType":  77,
                                                                                 "enabled":  true
                                                                             },
                                                                             {
                                                                                 "dataType":  16,
-                                                                                "category":  14,
+                                                                                "category":  15,
                                                                                 "nameResourceKey":  "bitLockerFixedEncryptionMethodName",
                                                                                 "descriptionResourceKey":  "bitLockerXTSAESEncryptionMethodDescription",
                                                                                 "childSettings":  [
@@ -220,7 +220,7 @@
                                                                                                     "children":  [
                                                                                                                      {
                                                                                                                          "dataType":  10,
-                                                                                                                         "category":  14,
+                                                                                                                         "category":  15,
                                                                                                                          "nameResourceKey":  "bitlockerWarningInfoBox",
                                                                                                                          "childSettings":  [
 
@@ -229,7 +229,7 @@
 
                                                                                                                                      ],
                                                                                                                          "booleanActions":  0,
-                                                                                                                         "policyType":  76,
+                                                                                                                         "policyType":  77,
                                                                                                                          "enabled":  true
                                                                                                                      }
                                                                                                                  ],
@@ -241,7 +241,7 @@
                                                                                                     "children":  [
                                                                                                                      {
                                                                                                                          "dataType":  10,
-                                                                                                                         "category":  14,
+                                                                                                                         "category":  15,
                                                                                                                          "nameResourceKey":  "bitlockerWarningInfoBox",
                                                                                                                          "childSettings":  [
 
@@ -250,7 +250,7 @@
 
                                                                                                                                      ],
                                                                                                                          "booleanActions":  0,
-                                                                                                                         "policyType":  76,
+                                                                                                                         "policyType":  77,
                                                                                                                          "enabled":  true
                                                                                                                      }
                                                                                                                  ],
@@ -267,7 +267,7 @@
                                                                                                     "children":  [
                                                                                                                      {
                                                                                                                          "dataType":  10,
-                                                                                                                         "category":  14,
+                                                                                                                         "category":  15,
                                                                                                                          "nameResourceKey":  "bitlockerWarningInfoBox",
                                                                                                                          "childSettings":  [
 
@@ -276,7 +276,7 @@
 
                                                                                                                                      ],
                                                                                                                          "booleanActions":  0,
-                                                                                                                         "policyType":  76,
+                                                                                                                         "policyType":  77,
                                                                                                                          "enabled":  true
                                                                                                                      }
                                                                                                                  ],
@@ -287,12 +287,12 @@
                                                                                 "booleanActions":  0,
                                                                                 "defaultValue":  "xtsAes128",
                                                                                 "unconfiguredValue":  "xtsAes128",
-                                                                                "policyType":  76,
+                                                                                "policyType":  77,
                                                                                 "enabled":  true
                                                                             },
                                                                             {
                                                                                 "dataType":  16,
-                                                                                "category":  14,
+                                                                                "category":  15,
                                                                                 "nameResourceKey":  "bitLockerRemovableEncryptionMethodName",
                                                                                 "descriptionResourceKey":  "bitLockerRemovableEncryptionMethodDescription",
                                                                                 "childSettings":  [
@@ -310,7 +310,7 @@
                                                                                                     "children":  [
                                                                                                                      {
                                                                                                                          "dataType":  10,
-                                                                                                                         "category":  14,
+                                                                                                                         "category":  15,
                                                                                                                          "nameResourceKey":  "bitlockerWarningInfoBox",
                                                                                                                          "childSettings":  [
 
@@ -319,7 +319,7 @@
 
                                                                                                                                      ],
                                                                                                                          "booleanActions":  0,
-                                                                                                                         "policyType":  76,
+                                                                                                                         "policyType":  77,
                                                                                                                          "enabled":  true
                                                                                                                      }
                                                                                                                  ],
@@ -331,7 +331,7 @@
                                                                                                     "children":  [
                                                                                                                      {
                                                                                                                          "dataType":  10,
-                                                                                                                         "category":  14,
+                                                                                                                         "category":  15,
                                                                                                                          "nameResourceKey":  "bitlockerWarningInfoBox",
                                                                                                                          "childSettings":  [
 
@@ -340,7 +340,7 @@
 
                                                                                                                                      ],
                                                                                                                          "booleanActions":  0,
-                                                                                                                         "policyType":  76,
+                                                                                                                         "policyType":  77,
                                                                                                                          "enabled":  true
                                                                                                                      }
                                                                                                                  ],
@@ -352,7 +352,7 @@
                                                                                                     "children":  [
                                                                                                                      {
                                                                                                                          "dataType":  10,
-                                                                                                                         "category":  14,
+                                                                                                                         "category":  15,
                                                                                                                          "nameResourceKey":  "bitlockerWarningInfoBox",
                                                                                                                          "childSettings":  [
 
@@ -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,14 +383,14 @@
                                                       "booleanActions":  2,
                                                       "defaultValue":  false,
                                                       "unconfiguredValue":  false,
-                                                      "policyType":  76,
+                                                      "policyType":  77,
                                                       "enabled":  true
                                                   },
                                                   {
                                                       "isSettingDescription":  false,
                                                       "showAsSectionHeader":  false,
                                                       "dataType":  8,
-                                                      "category":  14,
+                                                      "category":  15,
                                                       "nameResourceKey":  "bitLockerSystemDriveSettingsName",
                                                       "descriptionResourceKey":  "bitLockerSystemDriveSettingsDescription",
                                                       "childSettings":  [
@@ -400,18 +400,18 @@
 
                                                                   ],
                                                       "booleanActions":  0,
-                                                      "policyType":  76,
+                                                      "policyType":  77,
                                                       "enabled":  true
                                                   },
                                                   {
                                                       "dataType":  0,
-                                                      "category":  14,
+                                                      "category":  15,
                                                       "nameResourceKey":  "bitLockerSystemDriveStartupAuthenticationRequiredName",
                                                       "descriptionResourceKey":  "bitLockerSystemDriveStartupAuthenticationRequiredDescription",
                                                       "childSettings":  [
                                                                             {
                                                                                 "dataType":  0,
-                                                                                "category":  14,
+                                                                                "category":  15,
                                                                                 "nameResourceKey":  "bitLockerSystemDriveStartupAuthenticationBlockWithoutTpmChipName",
                                                                                 "descriptionResourceKey":  "bitLockerSystemDriveStartupAuthenticationBlockWithoutTpmChipDescription",
                                                                                 "childSettings":  [
@@ -424,12 +424,12 @@
                                                                                 "booleanActions":  3,
                                                                                 "defaultValue":  false,
                                                                                 "unconfiguredValue":  false,
-                                                                                "policyType":  76,
+                                                                                "policyType":  77,
                                                                                 "enabled":  true
                                                                             },
                                                                             {
                                                                                 "dataType":  16,
-                                                                                "category":  14,
+                                                                                "category":  15,
                                                                                 "nameResourceKey":  "bitLockerSystemDriveStartupAuthenticationTpmName",
                                                                                 "descriptionResourceKey":  "bitLockerSystemDriveStartupAuthenticationTpmDescription",
                                                                                 "childSettings":  [
@@ -456,12 +456,12 @@
                                                                                 "booleanActions":  0,
                                                                                 "defaultValue":  "allowed",
                                                                                 "unconfiguredValue":  "allowed",
-                                                                                "policyType":  76,
+                                                                                "policyType":  77,
                                                                                 "enabled":  true
                                                                             },
                                                                             {
                                                                                 "dataType":  16,
-                                                                                "category":  14,
+                                                                                "category":  15,
                                                                                 "nameResourceKey":  "bitLockerSystemDriveStartupAuthenticationTpmPinName",
                                                                                 "descriptionResourceKey":  "bitLockerSystemDriveStartupAuthenticationTpmPinDescription",
                                                                                 "childSettings":  [
@@ -488,12 +488,12 @@
                                                                                 "booleanActions":  0,
                                                                                 "defaultValue":  "allowed",
                                                                                 "unconfiguredValue":  "allowed",
-                                                                                "policyType":  76,
+                                                                                "policyType":  77,
                                                                                 "enabled":  true
                                                                             },
                                                                             {
                                                                                 "dataType":  16,
-                                                                                "category":  14,
+                                                                                "category":  15,
                                                                                 "nameResourceKey":  "bitLockerSystemDriveStartupAuthenticationTpmKeyName",
                                                                                 "descriptionResourceKey":  "bitLockerSystemDriveStartupAuthenticationTpmKeyDescription",
                                                                                 "childSettings":  [
@@ -520,12 +520,12 @@
                                                                                 "booleanActions":  0,
                                                                                 "defaultValue":  "allowed",
                                                                                 "unconfiguredValue":  "allowed",
-                                                                                "policyType":  76,
+                                                                                "policyType":  77,
                                                                                 "enabled":  true
                                                                             },
                                                                             {
                                                                                 "dataType":  16,
-                                                                                "category":  14,
+                                                                                "category":  15,
                                                                                 "nameResourceKey":  "bitLockerSystemDriveStartupAuthenticationTpmPinKeyName",
                                                                                 "descriptionResourceKey":  "bitLockerSystemDriveStartupAuthenticationTpmPinKeyDescription",
                                                                                 "childSettings":  [
@@ -552,18 +552,18 @@
                                                                                 "booleanActions":  0,
                                                                                 "defaultValue":  "allowed",
                                                                                 "unconfiguredValue":  "allowed",
-                                                                                "policyType":  76,
+                                                                                "policyType":  77,
                                                                                 "enabled":  true
                                                                             },
                                                                             {
                                                                                 "dataType":  0,
-                                                                                "category":  14,
+                                                                                "category":  15,
                                                                                 "nameResourceKey":  "bitLockerSystemDriveMiniumPinLengthEnableName",
                                                                                 "descriptionResourceKey":  "bitLockerSystemDriveMiniumPinLengthEnableDescription",
                                                                                 "childSettings":  [
                                                                                                       {
                                                                                                           "dataType":  14,
-                                                                                                          "category":  14,
+                                                                                                          "category":  15,
                                                                                                           "nameResourceKey":  "bitLockerSystemDriveMiniumPinLengthName",
                                                                                                           "descriptionResourceKey":  "bitLockerSystemDriveMiniumPinLengthDescription",
                                                                                                           "childSettings":  [
@@ -574,7 +574,7 @@
                                                                                                                       ],
                                                                                                           "entityKey":  "minimumPinLength",
                                                                                                           "booleanActions":  0,
-                                                                                                          "policyType":  76,
+                                                                                                          "policyType":  77,
                                                                                                           "enabled":  true
                                                                                                       }
                                                                                                   ],
@@ -585,18 +585,18 @@
                                                                                 "booleanActions":  2,
                                                                                 "defaultValue":  false,
                                                                                 "unconfiguredValue":  false,
-                                                                                "policyType":  76,
+                                                                                "policyType":  77,
                                                                                 "enabled":  true
                                                                             },
                                                                             {
                                                                                 "dataType":  0,
-                                                                                "category":  14,
+                                                                                "category":  15,
                                                                                 "nameResourceKey":  "bitLockerSyntheticSystemDrivePolicyDriveRecoveryName",
                                                                                 "descriptionResourceKey":  "bitLockerSyntheticSystemDrivePolicyDriveRecoveryDescription",
                                                                                 "childSettings":  [
                                                                                                       {
                                                                                                           "dataType":  0,
-                                                                                                          "category":  14,
+                                                                                                          "category":  15,
                                                                                                           "nameResourceKey":  "bitLockerSyntheticSystemDrivePolicyDriveRecoveryAgentName",
                                                                                                           "descriptionResourceKey":  "bitLockerSyntheticSystemDrivePolicyDriveRecoveryAgentDescription",
                                                                                                           "childSettings":  [
@@ -609,12 +609,12 @@
                                                                                                           "booleanActions":  3,
                                                                                                           "defaultValue":  false,
                                                                                                           "unconfiguredValue":  false,
-                                                                                                          "policyType":  76,
+                                                                                                          "policyType":  77,
                                                                                                           "enabled":  true
                                                                                                       },
                                                                                                       {
                                                                                                           "dataType":  16,
-                                                                                                          "category":  14,
+                                                                                                          "category":  15,
                                                                                                           "nameResourceKey":  "bitLockerRecoveryOptionsPasswordName",
                                                                                                           "descriptionResourceKey":  "bitLockerRecoveryOptionsPasswordDescription",
                                                                                                           "childSettings":  [
@@ -641,12 +641,12 @@
                                                                                                           "booleanActions":  0,
                                                                                                           "defaultValue":  "allowed",
                                                                                                           "unconfiguredValue":  "allowed",
-                                                                                                          "policyType":  76,
+                                                                                                          "policyType":  77,
                                                                                                           "enabled":  true
                                                                                                       },
                                                                                                       {
                                                                                                           "dataType":  16,
-                                                                                                          "category":  14,
+                                                                                                          "category":  15,
                                                                                                           "nameResourceKey":  "bitLockerRecoveryOptionsKeyName",
                                                                                                           "descriptionResourceKey":  "bitLockerRecoveryOptionsKeyDescription",
                                                                                                           "childSettings":  [
@@ -673,12 +673,12 @@
                                                                                                           "booleanActions":  0,
                                                                                                           "defaultValue":  "allowed",
                                                                                                           "unconfiguredValue":  "allowed",
-                                                                                                          "policyType":  76,
+                                                                                                          "policyType":  77,
                                                                                                           "enabled":  true
                                                                                                       },
                                                                                                       {
                                                                                                           "dataType":  0,
-                                                                                                          "category":  14,
+                                                                                                          "category":  15,
                                                                                                           "nameResourceKey":  "bitLockerRecoveryOptionsHideName",
                                                                                                           "descriptionResourceKey":  "bitLockerRecoveryOptionsHideDescription",
                                                                                                           "childSettings":  [
@@ -691,12 +691,12 @@
                                                                                                           "booleanActions":  3,
                                                                                                           "defaultValue":  false,
                                                                                                           "unconfiguredValue":  false,
-                                                                                                          "policyType":  76,
+                                                                                                          "policyType":  77,
                                                                                                           "enabled":  true
                                                                                                       },
                                                                                                       {
                                                                                                           "dataType":  0,
-                                                                                                          "category":  14,
+                                                                                                          "category":  15,
                                                                                                           "nameResourceKey":  "bitLockerRecoveryOptionsSaveToStoreName",
                                                                                                           "descriptionResourceKey":  "bitLockerRecoveryOptionsSaveToStoreDescription",
                                                                                                           "childSettings":  [
@@ -709,12 +709,12 @@
                                                                                                           "booleanActions":  2,
                                                                                                           "defaultValue":  false,
                                                                                                           "unconfiguredValue":  false,
-                                                                                                          "policyType":  76,
+                                                                                                          "policyType":  77,
                                                                                                           "enabled":  true
                                                                                                       },
                                                                                                       {
                                                                                                           "dataType":  16,
-                                                                                                          "category":  14,
+                                                                                                          "category":  15,
                                                                                                           "nameResourceKey":  "bitLockerRecoveryOptionsInformationToStoreName",
                                                                                                           "descriptionResourceKey":  "bitLockerRecoveryOptionsInformationToStoreDescription",
                                                                                                           "childSettings":  [
@@ -736,12 +736,12 @@
                                                                                                           "booleanActions":  0,
                                                                                                           "defaultValue":  "passwordAndKey",
                                                                                                           "unconfiguredValue":  "passwordAndKey",
-                                                                                                          "policyType":  76,
+                                                                                                          "policyType":  77,
                                                                                                           "enabled":  true
                                                                                                       },
                                                                                                       {
                                                                                                           "dataType":  16,
-                                                                                                          "category":  14,
+                                                                                                          "category":  15,
                                                                                                           "nameResourceKey":  "BitLockerRecoveryPasswordRotationName",
                                                                                                           "descriptionResourceKey":  "BitLockerRecoveryPasswordRotationDescription",
                                                                                                           "childSettings":  [
@@ -773,12 +773,12 @@
                                                                                                           "booleanActions":  0,
                                                                                                           "defaultValue":  "notConfigured",
                                                                                                           "unconfiguredValue":  "notConfigured",
-                                                                                                          "policyType":  76,
+                                                                                                          "policyType":  77,
                                                                                                           "enabled":  true
                                                                                                       },
                                                                                                       {
                                                                                                           "dataType":  0,
-                                                                                                          "category":  14,
+                                                                                                          "category":  15,
                                                                                                           "nameResourceKey":  "bitLockerRecoveryOptionsAfterRecoveryInformationToStoreName",
                                                                                                           "descriptionResourceKey":  "bitLockerRecoveryOptionsAfterRecoveryInformationToStoreDescription",
                                                                                                           "childSettings":  [
@@ -791,7 +791,7 @@
                                                                                                           "booleanActions":  1,
                                                                                                           "defaultValue":  false,
                                                                                                           "unconfiguredValue":  false,
-                                                                                                          "policyType":  76,
+                                                                                                          "policyType":  77,
                                                                                                           "enabled":  true
                                                                                                       }
                                                                                                   ],
@@ -802,18 +802,18 @@
                                                                                 "booleanActions":  2,
                                                                                 "defaultValue":  false,
                                                                                 "unconfiguredValue":  false,
-                                                                                "policyType":  76,
+                                                                                "policyType":  77,
                                                                                 "enabled":  true
                                                                             },
                                                                             {
                                                                                 "dataType":  0,
-                                                                                "category":  14,
+                                                                                "category":  15,
                                                                                 "nameResourceKey":  "bitLockerSystemDrivePrebootRecoveryEnableName",
                                                                                 "descriptionResourceKey":  "bitLockerSystemDrivePrebootRecoveryEnableDescription",
                                                                                 "childSettings":  [
                                                                                                       {
                                                                                                           "dataType":  16,
-                                                                                                          "category":  14,
+                                                                                                          "category":  15,
                                                                                                           "nameResourceKey":  "bitLockerSystemDrivePrebootRecoveryMsgURLOptionName",
                                                                                                           "descriptionResourceKey":  "bitLockerSystemDrivePrebootRecoveryMsgURLOptionDescription",
                                                                                                           "childSettings":  [
@@ -836,7 +836,7 @@
                                                                                                                               "children":  [
                                                                                                                                                {
                                                                                                                                                    "dataType":  20,
-                                                                                                                                                   "category":  14,
+                                                                                                                                                   "category":  15,
                                                                                                                                                    "nameResourceKey":  "bitLockerSystemDrivePrebootRecoveryCustomMsgName",
                                                                                                                                                    "descriptionResourceKey":  "bitLockerSystemDrivePrebootRecoveryCustomMsgDescription",
                                                                                                                                                    "childSettings":  [
@@ -847,7 +847,7 @@
                                                                                                                                                                ],
                                                                                                                                                    "entityKey":  "prebootRecoveryMessage",
                                                                                                                                                    "booleanActions":  0,
-                                                                                                                                                   "policyType":  76,
+                                                                                                                                                   "policyType":  77,
                                                                                                                                                    "enabled":  true
                                                                                                                                                }
                                                                                                                                            ],
@@ -859,7 +859,7 @@
                                                                                                                               "children":  [
                                                                                                                                                {
                                                                                                                                                    "dataType":  20,
-                                                                                                                                                   "category":  14,
+                                                                                                                                                   "category":  15,
                                                                                                                                                    "nameResourceKey":  "bitLockerSystemDrivePrebootRecoveryCustomURLName",
                                                                                                                                                    "descriptionResourceKey":  "bitLockerSystemDrivePrebootRecoveryCustomURLDescription",
                                                                                                                                                    "childSettings":  [
@@ -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,14 +903,14 @@
                                                       "booleanActions":  1,
                                                       "defaultValue":  false,
                                                       "unconfiguredValue":  false,
-                                                      "policyType":  76,
+                                                      "policyType":  77,
                                                       "enabled":  true
                                                   },
                                                   {
                                                       "isSettingDescription":  false,
                                                       "showAsSectionHeader":  false,
                                                       "dataType":  8,
-                                                      "category":  14,
+                                                      "category":  15,
                                                       "nameResourceKey":  "bitLockerFixedDriveSettingsName",
                                                       "descriptionResourceKey":  "bitLockerFixedDriveSettingsDescription",
                                                       "childSettings":  [
@@ -920,12 +920,12 @@
 
                                                                   ],
                                                       "booleanActions":  0,
-                                                      "policyType":  76,
+                                                      "policyType":  77,
                                                       "enabled":  true
                                                   },
                                                   {
                                                       "dataType":  0,
-                                                      "category":  14,
+                                                      "category":  15,
                                                       "nameResourceKey":  "bitLockerFixedDriveWriteAccessName",
                                                       "descriptionResourceKey":  "bitLockerFixedDriveWriteAccessDescription",
                                                       "childSettings":  [
@@ -938,18 +938,18 @@
                                                       "booleanActions":  3,
                                                       "defaultValue":  false,
                                                       "unconfiguredValue":  false,
-                                                      "policyType":  76,
+                                                      "policyType":  77,
                                                       "enabled":  true
                                                   },
                                                   {
                                                       "dataType":  0,
-                                                      "category":  14,
+                                                      "category":  15,
                                                       "nameResourceKey":  "bitLockerSyntheticFixedDrivePolicyDriveRecoveryName",
                                                       "descriptionResourceKey":  "bitLockerSyntheticFixedDrivePolicyDriveRecoveryDescription",
                                                       "childSettings":  [
                                                                             {
                                                                                 "dataType":  0,
-                                                                                "category":  14,
+                                                                                "category":  15,
                                                                                 "nameResourceKey":  "bitLockerSyntheticFixedDrivePolicyDriveRecoveryAgentName",
                                                                                 "descriptionResourceKey":  "bitLockerSyntheticFixedDrivePolicyDriveRecoveryAgentDescription",
                                                                                 "childSettings":  [
@@ -962,12 +962,12 @@
                                                                                 "booleanActions":  3,
                                                                                 "defaultValue":  false,
                                                                                 "unconfiguredValue":  false,
-                                                                                "policyType":  76,
+                                                                                "policyType":  77,
                                                                                 "enabled":  true
                                                                             },
                                                                             {
                                                                                 "dataType":  16,
-                                                                                "category":  14,
+                                                                                "category":  15,
                                                                                 "nameResourceKey":  "bitLockerRecoveryOptionsPasswordName",
                                                                                 "descriptionResourceKey":  "bitLockerRecoveryOptionsPasswordDescription",
                                                                                 "childSettings":  [
@@ -994,12 +994,12 @@
                                                                                 "booleanActions":  0,
                                                                                 "defaultValue":  "allowed",
                                                                                 "unconfiguredValue":  "allowed",
-                                                                                "policyType":  76,
+                                                                                "policyType":  77,
                                                                                 "enabled":  true
                                                                             },
                                                                             {
                                                                                 "dataType":  16,
-                                                                                "category":  14,
+                                                                                "category":  15,
                                                                                 "nameResourceKey":  "bitLockerRecoveryOptionsKeyName",
                                                                                 "descriptionResourceKey":  "bitLockerRecoveryOptionsKeyDescription",
                                                                                 "childSettings":  [
@@ -1026,12 +1026,12 @@
                                                                                 "booleanActions":  0,
                                                                                 "defaultValue":  "allowed",
                                                                                 "unconfiguredValue":  "allowed",
-                                                                                "policyType":  76,
+                                                                                "policyType":  77,
                                                                                 "enabled":  true
                                                                             },
                                                                             {
                                                                                 "dataType":  0,
-                                                                                "category":  14,
+                                                                                "category":  15,
                                                                                 "nameResourceKey":  "bitLockerRecoveryOptionsHideName",
                                                                                 "descriptionResourceKey":  "bitLockerRecoveryOptionsHideDescription",
                                                                                 "childSettings":  [
@@ -1044,12 +1044,12 @@
                                                                                 "booleanActions":  3,
                                                                                 "defaultValue":  false,
                                                                                 "unconfiguredValue":  false,
-                                                                                "policyType":  76,
+                                                                                "policyType":  77,
                                                                                 "enabled":  true
                                                                             },
                                                                             {
                                                                                 "dataType":  0,
-                                                                                "category":  14,
+                                                                                "category":  15,
                                                                                 "nameResourceKey":  "bitLockerRecoveryOptionsSaveToStoreName",
                                                                                 "descriptionResourceKey":  "bitLockerRecoveryOptionsSaveToStoreDescription",
                                                                                 "childSettings":  [
@@ -1062,12 +1062,12 @@
                                                                                 "booleanActions":  2,
                                                                                 "defaultValue":  false,
                                                                                 "unconfiguredValue":  false,
-                                                                                "policyType":  76,
+                                                                                "policyType":  77,
                                                                                 "enabled":  true
                                                                             },
                                                                             {
                                                                                 "dataType":  16,
-                                                                                "category":  14,
+                                                                                "category":  15,
                                                                                 "nameResourceKey":  "bitLockerRecoveryOptionsInformationToStoreName",
                                                                                 "descriptionResourceKey":  "bitLockerRecoveryOptionsInformationToStoreDescription",
                                                                                 "childSettings":  [
@@ -1089,12 +1089,12 @@
                                                                                 "booleanActions":  0,
                                                                                 "defaultValue":  "passwordAndKey",
                                                                                 "unconfiguredValue":  "passwordAndKey",
-                                                                                "policyType":  76,
+                                                                                "policyType":  77,
                                                                                 "enabled":  true
                                                                             },
                                                                             {
                                                                                 "dataType":  0,
-                                                                                "category":  14,
+                                                                                "category":  15,
                                                                                 "nameResourceKey":  "bitLockerRecoveryOptionsAfterRecoveryInformationToStoreName",
                                                                                 "descriptionResourceKey":  "bitLockerRecoveryOptionsAfterRecoveryInformationToStoreDescription",
                                                                                 "childSettings":  [
@@ -1107,7 +1107,7 @@
                                                                                 "booleanActions":  1,
                                                                                 "defaultValue":  false,
                                                                                 "unconfiguredValue":  false,
-                                                                                "policyType":  76,
+                                                                                "policyType":  77,
                                                                                 "enabled":  true
                                                                             }
                                                                         ],
@@ -1118,14 +1118,14 @@
                                                       "booleanActions":  2,
                                                       "defaultValue":  false,
                                                       "unconfiguredValue":  false,
-                                                      "policyType":  76,
+                                                      "policyType":  77,
                                                       "enabled":  true
                                                   },
                                                   {
                                                       "isSettingDescription":  false,
                                                       "showAsSectionHeader":  false,
                                                       "dataType":  8,
-                                                      "category":  14,
+                                                      "category":  15,
                                                       "nameResourceKey":  "bitLockerRemovableDriveSettingsName",
                                                       "descriptionResourceKey":  "bitLockerRemovableDriveSettingsDescription",
                                                       "childSettings":  [
@@ -1135,18 +1135,18 @@
 
                                                                   ],
                                                       "booleanActions":  0,
-                                                      "policyType":  76,
+                                                      "policyType":  77,
                                                       "enabled":  true
                                                   },
                                                   {
                                                       "dataType":  0,
-                                                      "category":  14,
+                                                      "category":  15,
                                                       "nameResourceKey":  "bitLockerRemovableDriveWriteAccessName",
                                                       "descriptionResourceKey":  "bitLockerRemovableDriveWriteAccessDescription",
                                                       "childSettings":  [
                                                                             {
                                                                                 "dataType":  0,
-                                                                                "category":  14,
+                                                                                "category":  15,
                                                                                 "nameResourceKey":  "bitLockerRemovableDriveWriteAccessCrossOrgName",
                                                                                 "descriptionResourceKey":  "bitLockerRemovableDriveWriteAccessCrossOrgDescription",
                                                                                 "childSettings":  [
@@ -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/bootoptions_windows10devicefirmwareconfigurationinterface.json

@@ -0,0 +1,68 @@
+{
+    "bootoptions_windows10devicefirmwareconfigurationinterface":  [
+                                                                      {
+                                                                          "dataType":  16,
+                                                                          "category":  16,
+                                                                          "nameResourceKey":  "bootFromExternalMediaName",
+                                                                          "descriptionResourceKey":  "bootFromExternalMediaDescription",
+                                                                          "childSettings":  [
+
+                                                                                            ],
+                                                                          "options":  [
+                                                                                          {
+                                                                                              "nameResourceKey":  "notConfigured",
+                                                                                              "value":  "notConfigured",
+                                                                                              "enabled":  true
+                                                                                          },
+                                                                                          {
+                                                                                              "nameResourceKey":  "enabledOption",
+                                                                                              "value":  "enabled",
+                                                                                              "enabled":  true
+                                                                                          },
+                                                                                          {
+                                                                                              "nameResourceKey":  "disabledOption",
+                                                                                              "value":  "disabled",
+                                                                                              "enabled":  true
+                                                                                          }
+                                                                                      ],
+                                                                          "entityKey":  "bootFromExternalMedia",
+                                                                          "booleanActions":  0,
+                                                                          "defaultValue":  "notConfigured",
+                                                                          "unconfiguredValue":  "notConfigured",
+                                                                          "policyType":  108,
+                                                                          "enabled":  true
+                                                                      },
+                                                                      {
+                                                                          "dataType":  16,
+                                                                          "category":  16,
+                                                                          "nameResourceKey":  "bootFromBuiltInNetworkAdaptersName",
+                                                                          "descriptionResourceKey":  "bootFromBuiltInNetworkAdaptersDescription",
+                                                                          "childSettings":  [
+
+                                                                                            ],
+                                                                          "options":  [
+                                                                                          {
+                                                                                              "nameResourceKey":  "notConfigured",
+                                                                                              "value":  "notConfigured",
+                                                                                              "enabled":  true
+                                                                                          },
+                                                                                          {
+                                                                                              "nameResourceKey":  "enabledOption",
+                                                                                              "value":  "enabled",
+                                                                                              "enabled":  true
+                                                                                          },
+                                                                                          {
+                                                                                              "nameResourceKey":  "disabledOption",
+                                                                                              "value":  "disabled",
+                                                                                              "enabled":  true
+                                                                                          }
+                                                                                      ],
+                                                                          "entityKey":  "bootFromBuiltInNetworkAdapters",
+                                                                          "booleanActions":  0,
+                                                                          "defaultValue":  "notConfigured",
+                                                                          "unconfiguredValue":  "notConfigured",
+                                                                          "policyType":  108,
+                                                                          "enabled":  true
+                                                                      }
+                                                                  ]
+}

Documentation/ObjectInfo/browser_androidgeneral.json

@@ -1,13 +1,13 @@
-{
+{
     "browser_androidgeneral":  {
                                    "dataType":  0,
-                                   "category":  15,
+                                   "category":  17,
                                    "nameResourceKey":  "knoxBlockWebBrowserName",
                                    "descriptionResourceKey":  "knoxBlockWebBrowserDescription",
                                    "childSettings":  [
                                                          {
                                                              "dataType":  0,
-                                                             "category":  15,
+                                                             "category":  17,
                                                              "nameResourceKey":  "knoxBlockAutofillName",
                                                              "descriptionResourceKey":  "knoxBlockAutofillDescription",
                                                              "childSettings":  [
@@ -24,7 +24,7 @@
                                                          },
                                                          {
                                                              "dataType":  16,
-                                                             "category":  15,
+                                                             "category":  17,
                                                              "nameResourceKey":  "knoxBlockCookiesName",
                                                              "descriptionResourceKey":  "KnoxBlockCookiesDescription",
                                                              "childSettings":  [
@@ -66,7 +66,7 @@
                                                          },
                                                          {
                                                              "dataType":  0,
-                                                             "category":  15,
+                                                             "category":  17,
                                                              "nameResourceKey":  "knoxBlockJavaScriptName",
                                                              "descriptionResourceKey":  "knoxBlockJavaScriptDescription",
                                                              "childSettings":  [
@@ -83,7 +83,7 @@
                                                          },
                                                          {
                                                              "dataType":  0,
-                                                             "category":  15,
+                                                             "category":  17,
                                                              "nameResourceKey":  "knoxBlockPopUpsName",
                                                              "descriptionResourceKey":  "knoxBlockPopUpsDescription",
                                                              "childSettings":  [

Documentation/ObjectInfo/browser_windows8general.json

@@ -1,8 +1,8 @@
-{
+{
     "browser_windows8general":  [
                                     {
                                         "dataType":  0,
-                                        "category":  15,
+                                        "category":  17,
                                         "nameResourceKey":  "blockAutofillName",
                                         "descriptionResourceKey":  "blockAutofillDescription",
                                         "childSettings":  [
@@ -14,12 +14,12 @@
                                         "entityKey":  "browserBlockAutofill",
                                         "booleanActions":  3,
                                         "defaultValue":  false,
-                                        "policyType":  91,
+                                        "policyType":  92,
                                         "enabled":  true
                                     },
                                     {
                                         "dataType":  0,
-                                        "category":  15,
+                                        "category":  17,
                                         "nameResourceKey":  "requireFraudWarningName",
                                         "descriptionResourceKey":  "requireFraudWarningDescription",
                                         "childSettings":  [
@@ -31,12 +31,12 @@
                                         "entityKey":  "browserRequireFraudWarning",
                                         "booleanActions":  1,
                                         "defaultValue":  false,
-                                        "policyType":  91,
+                                        "policyType":  92,
                                         "enabled":  true
                                     },
                                     {
                                         "dataType":  0,
-                                        "category":  15,
+                                        "category":  17,
                                         "nameResourceKey":  "blockSmartScreenName",
                                         "descriptionResourceKey":  "blockSmartScreenDescription",
                                         "childSettings":  [
@@ -48,12 +48,12 @@
                                         "entityKey":  "browserRequireSmartScreen",
                                         "booleanActions":  3,
                                         "defaultValue":  false,
-                                        "policyType":  91,
+                                        "policyType":  92,
                                         "enabled":  true
                                     },
                                     {
                                         "dataType":  0,
-                                        "category":  15,
+                                        "category":  17,
                                         "nameResourceKey":  "blockJavaScriptName",
                                         "descriptionResourceKey":  "blockJavaScriptDescription",
                                         "childSettings":  [
@@ -65,12 +65,12 @@
                                         "entityKey":  "browserBlockJavaScript",
                                         "booleanActions":  3,
                                         "defaultValue":  false,
-                                        "policyType":  91,
+                                        "policyType":  92,
                                         "enabled":  true
                                     },
                                     {
                                         "dataType":  0,
-                                        "category":  15,
+                                        "category":  17,
                                         "nameResourceKey":  "blockPopUpsName",
                                         "descriptionResourceKey":  "blockPopUpsDescription",
                                         "childSettings":  [
@@ -82,12 +82,12 @@
                                         "entityKey":  "browserBlockPopups",
                                         "booleanActions":  3,
                                         "defaultValue":  false,
-                                        "policyType":  91,
+                                        "policyType":  92,
                                         "enabled":  true
                                     },
                                     {
                                         "dataType":  0,
-                                        "category":  15,
+                                        "category":  17,
                                         "nameResourceKey":  "blockDoNotTrackHeaderName",
                                         "descriptionResourceKey":  "blockDoNotTrackHeaderDescription",
                                         "childSettings":  [
@@ -99,12 +99,12 @@
                                         "entityKey":  "browserBlockSendingDoNotTrackHeader",
                                         "booleanActions":  3,
                                         "defaultValue":  false,
-                                        "policyType":  91,
+                                        "policyType":  92,
                                         "enabled":  true
                                     },
                                     {
                                         "dataType":  0,
-                                        "category":  15,
+                                        "category":  17,
                                         "nameResourceKey":  "blockPluginsName",
                                         "descriptionResourceKey":  "blockPluginsDescription",
                                         "childSettings":  [
@@ -116,12 +116,12 @@
                                         "entityKey":  "browserBlockPlugins",
                                         "booleanActions":  3,
                                         "defaultValue":  false,
-                                        "policyType":  91,
+                                        "policyType":  92,
                                         "enabled":  true
                                     },
                                     {
                                         "dataType":  0,
-                                        "category":  15,
+                                        "category":  17,
                                         "nameResourceKey":  "blockSingleWordEntryIntranetName",
                                         "descriptionResourceKey":  "blockSingleWordEntryIntranetDescription",
                                         "childSettings":  [
@@ -133,12 +133,12 @@
                                         "entityKey":  "browserBlockSingleWordEntryOnIntranetSites",
                                         "booleanActions":  3,
                                         "defaultValue":  false,
-                                        "policyType":  91,
+                                        "policyType":  92,
                                         "enabled":  true
                                     },
                                     {
                                         "dataType":  0,
-                                        "category":  15,
+                                        "category":  17,
                                         "nameResourceKey":  "blockIntranetAutoDetectName",
                                         "descriptionResourceKey":  "blockIntranetAutoDetectDescription",
                                         "childSettings":  [
@@ -150,12 +150,12 @@
                                         "entityKey":  "browserBlockAutomaticDetectionOfIntranetSites",
                                         "booleanActions":  3,
                                         "defaultValue":  false,
-                                        "policyType":  91,
+                                        "policyType":  92,
                                         "enabled":  true
                                     },
                                     {
                                         "dataType":  16,
-                                        "category":  15,
+                                        "category":  17,
                                         "nameResourceKey":  "internetSecurityLevelName",
                                         "descriptionResourceKey":  "internetSecurityLevelDescription",
                                         "childSettings":  [
@@ -187,12 +187,12 @@
                                         "booleanActions":  0,
                                         "defaultValue":  "userDefined",
                                         "unconfiguredValue":  "userDefined",
-                                        "policyType":  91,
+                                        "policyType":  92,
                                         "enabled":  true
                                     },
                                     {
                                         "dataType":  16,
-                                        "category":  15,
+                                        "category":  17,
                                         "nameResourceKey":  "intranetSecurityLevelName",
                                         "descriptionResourceKey":  "intranetSecurityLevelDescription",
                                         "childSettings":  [
@@ -234,12 +234,12 @@
                                         "booleanActions":  0,
                                         "defaultValue":  "userDefined",
                                         "unconfiguredValue":  "userDefined",
-                                        "policyType":  91,
+                                        "policyType":  92,
                                         "enabled":  true
                                     },
                                     {
                                         "dataType":  16,
-                                        "category":  15,
+                                        "category":  17,
                                         "nameResourceKey":  "trustedSitesSecurityLevelName",
                                         "descriptionResourceKey":  "trustedSitesSecurityLevelDescription",
                                         "childSettings":  [
@@ -281,12 +281,12 @@
                                         "booleanActions":  0,
                                         "defaultValue":  "userDefined",
                                         "unconfiguredValue":  "userDefined",
-                                        "policyType":  91,
+                                        "policyType":  92,
                                         "enabled":  true
                                     },
                                     {
                                         "dataType":  0,
-                                        "category":  15,
+                                        "category":  17,
                                         "nameResourceKey":  "restrictedSitesSecurityLevelName",
                                         "descriptionResourceKey":  "restrictedSitesSecurityLevelDescription",
                                         "childSettings":  [
@@ -298,18 +298,18 @@
                                         "entityKey":  "browserRequireHighSecurityForRestrictedSites",
                                         "booleanActions":  4,
                                         "defaultValue":  false,
-                                        "policyType":  91,
+                                        "policyType":  92,
                                         "enabled":  true
                                     },
                                     {
                                         "dataType":  0,
-                                        "category":  15,
+                                        "category":  17,
                                         "nameResourceKey":  "enterpriseModeMenuAccessName",
                                         "descriptionResourceKey":  "enterpriseModeMenuAccessDescription",
                                         "childSettings":  [
                                                               {
                                                                   "dataType":  20,
-                                                                  "category":  15,
+                                                                  "category":  17,
                                                                   "nameResourceKey":  "loggingReportLocationName",
                                                                   "descriptionResourceKey":  "loggingReportLocationDescription",
                                                                   "emptyValueResourceKey":  "enterpriseModeLoggingExample",
@@ -321,7 +321,7 @@
                                                                               ],
                                                                   "entityKey":  "browserLoggingReportLocation",
                                                                   "booleanActions":  0,
-                                                                  "policyType":  91,
+                                                                  "policyType":  92,
                                                                   "enabled":  true
                                                               }
                                                           ],
@@ -331,12 +331,12 @@
                                         "entityKey":  "browserBlockEnterpriseModeAccess",
                                         "booleanActions":  3,
                                         "defaultValue":  false,
-                                        "policyType":  91,
+                                        "policyType":  92,
                                         "enabled":  true
                                     },
                                     {
                                         "dataType":  20,
-                                        "category":  15,
+                                        "category":  17,
                                         "nameResourceKey":  "enterpriseModeSiteListLocationName",
                                         "descriptionResourceKey":  "enterpriseModeSiteListLocationDescription",
                                         "emptyValueResourceKey":  "enterpriseModeSiteListExample",
@@ -348,7 +348,7 @@
                                                     ],
                                         "entityKey":  "browserEnterpriseModeSiteListLocation",
                                         "booleanActions":  0,
-                                        "policyType":  91,
+                                        "policyType":  92,
                                         "enabled":  true
                                     }
                                 ]

Documentation/ObjectInfo/browser_windowsphonegeneral.json

@@ -1,7 +1,7 @@
-{
+{
     "browser_windowsphonegeneral":  {
                                         "dataType":  0,
-                                        "category":  15,
+                                        "category":  17,
                                         "nameResourceKey":  "blockWebBrowserName",
                                         "descriptionResourceKey":  "blockWebBrowserDescription",
                                         "childSettings":  [
@@ -13,7 +13,7 @@
                                         "entityKey":  "webBrowserBlocked",
                                         "booleanActions":  3,
                                         "defaultValue":  false,
-                                        "policyType":  100,
+                                        "policyType":  101,
                                         "enabled":  true
                                     }
 }

Documentation/ObjectInfo/builtinapps_iosgeneral.json

@@ -1,21 +1,21 @@
-{
+{
     "builtinapps_iosgeneral":  [
                                    {
                                        "isSettingDescription":  false,
                                        "showAsSectionHeader":  true,
                                        "dataType":  8,
-                                       "category":  16,
+                                       "category":  18,
                                        "nameResourceKey":  "allEnrollmentTypesHeaderName",
                                        "descriptionResourceKey":  "allEnrollmentTypesHeaderDescription",
                                        "childSettings":  [
                                                              {
                                                                  "dataType":  0,
-                                                                 "category":  16,
+                                                                 "category":  18,
                                                                  "nameResourceKey":  "blockSiriName",
                                                                  "childSettings":  [
                                                                                        {
                                                                                            "dataType":  0,
-                                                                                           "category":  16,
+                                                                                           "category":  18,
                                                                                            "nameResourceKey":  "blockSiriWhenLockedName",
                                                                                            "childSettings":  [
 
@@ -26,7 +26,7 @@
                                                                                            "entityKey":  "siriBlockedWhenLocked",
                                                                                            "booleanActions":  9,
                                                                                            "defaultValue":  false,
-                                                                                           "policyType":  45,
+                                                                                           "policyType":  46,
                                                                                            "enabled":  true
                                                                                        }
                                                                                    ],
@@ -36,12 +36,12 @@
                                                                  "entityKey":  "siriBlocked",
                                                                  "booleanActions":  9,
                                                                  "defaultValue":  false,
-                                                                 "policyType":  45,
+                                                                 "policyType":  46,
                                                                  "enabled":  true
                                                              },
                                                              {
                                                                  "dataType":  0,
-                                                                 "category":  16,
+                                                                 "category":  18,
                                                                  "nameResourceKey":  "requireFraudWarningNameIOS",
                                                                  "childSettings":  [
 
@@ -52,7 +52,7 @@
                                                                  "entityKey":  "safariRequireFraudWarning",
                                                                  "booleanActions":  9,
                                                                  "defaultValue":  false,
-                                                                 "policyType":  45,
+                                                                 "policyType":  46,
                                                                  "enabled":  true
                                                              }
                                                          ],
@@ -60,20 +60,20 @@
 
                                                    ],
                                        "booleanActions":  0,
-                                       "policyType":  45,
+                                       "policyType":  46,
                                        "enabled":  true
                                    },
                                    {
                                        "isSettingDescription":  false,
                                        "showAsSectionHeader":  true,
                                        "dataType":  8,
-                                       "category":  16,
+                                       "category":  18,
                                        "nameResourceKey":  "deviceEnrollmentAndAutomatedDeviceEnrollmentHeaderName",
                                        "descriptionResourceKey":  "deviceEnrollmentAndAutomatedDeviceEnrollmentHeaderDescription",
                                        "childSettings":  [
                                                              {
                                                                  "dataType":  0,
-                                                                 "category":  16,
+                                                                 "category":  18,
                                                                  "nameResourceKey":  "blockSpotlightInternetResultsName",
                                                                  "descriptionResourceKey":  "blockSpotlightInternetResultsDescription",
                                                                  "childSettings":  [
@@ -85,12 +85,12 @@
                                                                  "entityKey":  "spotlightBlockInternetResults",
                                                                  "booleanActions":  9,
                                                                  "defaultValue":  false,
-                                                                 "policyType":  45,
+                                                                 "policyType":  46,
                                                                  "enabled":  true
                                                              },
                                                              {
                                                                  "dataType":  16,
-                                                                 "category":  16,
+                                                                 "category":  18,
                                                                  "nameResourceKey":  "blockCookiesNameIOS",
                                                                  "descriptionResourceKey":  "blockCookiesDescriptionIOS",
                                                                  "childSettings":  [
@@ -103,22 +103,17 @@
                                                                                      "enabled":  true
                                                                                  },
                                                                                  {
-                                                                                     "nameResourceKey":  "allowOption",
+                                                                                     "nameResourceKey":  "webBrowserCookiesAllowAll",
                                                                                      "value":  "allowAlways",
                                                                                      "enabled":  true
                                                                                  },
                                                                                  {
-                                                                                     "nameResourceKey":  "blockAllCookiesOption",
+                                                                                     "nameResourceKey":  "webBrowserCookiesPreventAndBlock",
                                                                                      "value":  "blockAlways",
                                                                                      "enabled":  true
                                                                                  },
                                                                                  {
-                                                                                     "nameResourceKey":  "allowVisitedSitesCookiesOption",
-                                                                                     "value":  "allowFromWebsitesVisited",
-                                                                                     "enabled":  true
-                                                                                 },
-                                                                                 {
-                                                                                     "nameResourceKey":  "allowCurrentWebSiteCookiesOption",
+                                                                                     "nameResourceKey":  "webBrowserCookiesPreventCrossSite",
                                                                                      "value":  "allowCurrentWebSite",
                                                                                      "enabled":  true
                                                                                  }
@@ -127,12 +122,12 @@
                                                                  "booleanActions":  0,
                                                                  "defaultValue":  "browserDefault",
                                                                  "unconfiguredValue":  "browserDefault",
-                                                                 "policyType":  45,
+                                                                 "policyType":  46,
                                                                  "enabled":  true
                                                              },
                                                              {
                                                                  "dataType":  0,
-                                                                 "category":  16,
+                                                                 "category":  18,
                                                                  "nameResourceKey":  "blockJavaScriptNameIOS",
                                                                  "childSettings":  [
 
@@ -143,12 +138,12 @@
                                                                  "entityKey":  "safariBlockJavaScript",
                                                                  "booleanActions":  9,
                                                                  "defaultValue":  false,
-                                                                 "policyType":  45,
+                                                                 "policyType":  46,
                                                                  "enabled":  true
                                                              },
                                                              {
                                                                  "dataType":  0,
-                                                                 "category":  16,
+                                                                 "category":  18,
                                                                  "nameResourceKey":  "blockPopUpsNameIOS",
                                                                  "childSettings":  [
 
@@ -159,7 +154,41 @@
                                                                  "entityKey":  "safariBlockPopups",
                                                                  "booleanActions":  9,
                                                                  "defaultValue":  false,
-                                                                 "policyType":  45,
+                                                                 "policyType":  46,
+                                                                 "enabled":  true
+                                                             },
+                                                             {
+                                                                 "dataType":  0,
+                                                                 "category":  18,
+                                                                 "nameResourceKey":  "onDeviceOnlyDictationForcedName",
+                                                                 "descriptionResourceKey":  "onDeviceOnlyDictationForcedDescription",
+                                                                 "childSettings":  [
+
+                                                                                   ],
+                                                                 "options":  [
+
+                                                                             ],
+                                                                 "entityKey":  "onDeviceOnlyDictationForced",
+                                                                 "booleanActions":  9,
+                                                                 "defaultValue":  false,
+                                                                 "policyType":  46,
+                                                                 "enabled":  true
+                                                             },
+                                                             {
+                                                                 "dataType":  0,
+                                                                 "category":  18,
+                                                                 "nameResourceKey":  "onDeviceOnlyTranslationForcedName",
+                                                                 "descriptionResourceKey":  "onDeviceOnlyTranslationForcedDescription",
+                                                                 "childSettings":  [
+
+                                                                                   ],
+                                                                 "options":  [
+
+                                                                             ],
+                                                                 "entityKey":  "onDeviceOnlyTranslationForced",
+                                                                 "booleanActions":  9,
+                                                                 "defaultValue":  false,
+                                                                 "policyType":  46,
                                                                  "enabled":  true
                                                              }
                                                          ],
@@ -167,25 +196,25 @@
 
                                                    ],
                                        "booleanActions":  0,
-                                       "policyType":  45,
+                                       "policyType":  46,
                                        "enabled":  true
                                    },
                                    {
                                        "isSettingDescription":  false,
                                        "showAsSectionHeader":  true,
                                        "dataType":  8,
-                                       "category":  16,
+                                       "category":  18,
                                        "nameResourceKey":  "automatedDeviceEnrollmentHeaderName",
                                        "descriptionResourceKey":  "automatedDeviceEnrollmentHeaderDescription",
                                        "childSettings":  [
                                                              {
                                                                  "dataType":  0,
-                                                                 "category":  16,
+                                                                 "category":  18,
                                                                  "nameResourceKey":  "blockIosCameraName",
                                                                  "childSettings":  [
                                                                                        {
                                                                                            "dataType":  0,
-                                                                                           "category":  16,
+                                                                                           "category":  18,
                                                                                            "nameResourceKey":  "blockFacetimeName",
                                                                                            "childSettings":  [
 
@@ -196,7 +225,7 @@
                                                                                            "entityKey":  "faceTimeBlocked",
                                                                                            "booleanActions":  9,
                                                                                            "defaultValue":  false,
-                                                                                           "policyType":  45,
+                                                                                           "policyType":  46,
                                                                                            "enabled":  true
                                                                                        }
                                                                                    ],
@@ -206,12 +235,12 @@
                                                                  "entityKey":  "cameraBlocked",
                                                                  "booleanActions":  9,
                                                                  "defaultValue":  false,
-                                                                 "policyType":  45,
+                                                                 "policyType":  46,
                                                                  "enabled":  true
                                                              },
                                                              {
                                                                  "dataType":  0,
-                                                                 "category":  16,
+                                                                 "category":  18,
                                                                  "nameResourceKey":  "requireSiriProfanityFilterName",
                                                                  "descriptionResourceKey":  "requireSiriProfanityFilterDescription",
                                                                  "childSettings":  [
@@ -223,12 +252,12 @@
                                                                  "entityKey":  "siriRequireProfanityFilter",
                                                                  "booleanActions":  9,
                                                                  "defaultValue":  false,
-                                                                 "policyType":  45,
+                                                                 "policyType":  46,
                                                                  "enabled":  true
                                                              },
                                                              {
                                                                  "dataType":  0,
-                                                                 "category":  16,
+                                                                 "category":  18,
                                                                  "nameResourceKey":  "blockSiriUserGeneratedContentName",
                                                                  "descriptionResourceKey":  "blockSiriUserGeneratedContentDescription",
                                                                  "childSettings":  [
@@ -240,12 +269,12 @@
                                                                  "entityKey":  "siriBlockUserGeneratedContent",
                                                                  "booleanActions":  9,
                                                                  "defaultValue":  false,
-                                                                 "policyType":  45,
+                                                                 "policyType":  46,
                                                                  "enabled":  true
                                                              },
                                                              {
                                                                  "dataType":  0,
-                                                                 "category":  16,
+                                                                 "category":  18,
                                                                  "nameResourceKey":  "blockAppleNewsName",
                                                                  "childSettings":  [
 
@@ -256,12 +285,12 @@
                                                                  "entityKey":  "appleNewsBlocked",
                                                                  "booleanActions":  9,
                                                                  "defaultValue":  false,
-                                                                 "policyType":  45,
+                                                                 "policyType":  46,
                                                                  "enabled":  true
                                                              },
                                                              {
                                                                  "dataType":  0,
-                                                                 "category":  16,
+                                                                 "category":  18,
                                                                  "nameResourceKey":  "blockIBooksStoreName",
                                                                  "childSettings":  [
 
@@ -272,12 +301,12 @@
                                                                  "entityKey":  "iBooksStoreBlocked",
                                                                  "booleanActions":  9,
                                                                  "defaultValue":  false,
-                                                                 "policyType":  45,
+                                                                 "policyType":  46,
                                                                  "enabled":  true
                                                              },
                                                              {
                                                                  "dataType":  0,
-                                                                 "category":  16,
+                                                                 "category":  18,
                                                                  "nameResourceKey":  "blockMessagesName",
                                                                  "childSettings":  [
 
@@ -288,12 +317,12 @@
                                                                  "entityKey":  "messagesBlocked",
                                                                  "booleanActions":  9,
                                                                  "defaultValue":  false,
-                                                                 "policyType":  45,
+                                                                 "policyType":  46,
                                                                  "enabled":  true
                                                              },
                                                              {
                                                                  "dataType":  0,
-                                                                 "category":  16,
+                                                                 "category":  18,
                                                                  "nameResourceKey":  "blockPodcastsName",
                                                                  "childSettings":  [
 
@@ -304,12 +333,12 @@
                                                                  "entityKey":  "podcastsBlocked",
                                                                  "booleanActions":  9,
                                                                  "defaultValue":  false,
-                                                                 "policyType":  45,
+                                                                 "policyType":  46,
                                                                  "enabled":  true
                                                              },
                                                              {
                                                                  "dataType":  0,
-                                                                 "category":  16,
+                                                                 "category":  18,
                                                                  "nameResourceKey":  "blockITunesMusicServiceName",
                                                                  "descriptionResourceKey":  "blockITunesMusicServiceDescription",
                                                                  "childSettings":  [
@@ -321,12 +350,12 @@
                                                                  "entityKey":  "iTunesBlockMusicService",
                                                                  "booleanActions":  9,
                                                                  "defaultValue":  false,
-                                                                 "policyType":  45,
+                                                                 "policyType":  46,
                                                                  "enabled":  true
                                                              },
                                                              {
                                                                  "dataType":  0,
-                                                                 "category":  16,
+                                                                 "category":  18,
                                                                  "nameResourceKey":  "blockITunesRadioName",
                                                                  "childSettings":  [
 
@@ -337,12 +366,12 @@
                                                                  "entityKey":  "iTunesBlockRadio",
                                                                  "booleanActions":  9,
                                                                  "defaultValue":  false,
-                                                                 "policyType":  45,
+                                                                 "policyType":  46,
                                                                  "enabled":  true
                                                              },
                                                              {
                                                                  "dataType":  0,
-                                                                 "category":  16,
+                                                                 "category":  18,
                                                                  "nameResourceKey":  "blockITunesStoreName",
                                                                  "childSettings":  [
 
@@ -353,12 +382,12 @@
                                                                  "entityKey":  "iTunesBlocked",
                                                                  "booleanActions":  9,
                                                                  "defaultValue":  false,
-                                                                 "policyType":  45,
+                                                                 "policyType":  46,
                                                                  "enabled":  true
                                                              },
                                                              {
                                                                  "dataType":  0,
-                                                                 "category":  16,
+                                                                 "category":  18,
                                                                  "nameResourceKey":  "blockFindMyDeviceName",
                                                                  "descriptionResourceKey":  "blockFindMyDeviceDescription",
                                                                  "childSettings":  [
@@ -370,12 +399,12 @@
                                                                  "entityKey":  "findMyDeviceInFindMyAppBlocked",
                                                                  "booleanActions":  9,
                                                                  "defaultValue":  false,
-                                                                 "policyType":  45,
+                                                                 "policyType":  46,
                                                                  "enabled":  true
                                                              },
                                                              {
                                                                  "dataType":  0,
-                                                                 "category":  16,
+                                                                 "category":  18,
                                                                  "nameResourceKey":  "blockFindMyFriendsName",
                                                                  "descriptionResourceKey":  "blockFindMyFriendsDescription",
                                                                  "childSettings":  [
@@ -387,12 +416,12 @@
                                                                  "entityKey":  "findMyFriendsInFindMyAppBlocked",
                                                                  "booleanActions":  9,
                                                                  "defaultValue":  false,
-                                                                 "policyType":  45,
+                                                                 "policyType":  46,
                                                                  "enabled":  true
                                                              },
                                                              {
                                                                  "dataType":  0,
-                                                                 "category":  16,
+                                                                 "category":  18,
                                                                  "nameResourceKey":  "blockFindMyFriendsModificationName",
                                                                  "descriptionResourceKey":  "blockFindMyFriendsModificationDescription",
                                                                  "childSettings":  [
@@ -404,12 +433,12 @@
                                                                  "entityKey":  "findMyFriendsBlocked",
                                                                  "booleanActions":  9,
                                                                  "defaultValue":  false,
-                                                                 "policyType":  45,
+                                                                 "policyType":  46,
                                                                  "enabled":  true
                                                              },
                                                              {
                                                                  "dataType":  0,
-                                                                 "category":  16,
+                                                                 "category":  18,
                                                                  "nameResourceKey":  "blockSystemAppRemovalName",
                                                                  "descriptionResourceKey":  "blockSystemAppRemovalDescription",
                                                                  "childSettings":  [
@@ -421,12 +450,12 @@
                                                                  "entityKey":  "blockSystemAppRemoval",
                                                                  "booleanActions":  9,
                                                                  "defaultValue":  false,
-                                                                 "policyType":  45,
+                                                                 "policyType":  46,
                                                                  "enabled":  true
                                                              },
                                                              {
                                                                  "dataType":  0,
-                                                                 "category":  16,
+                                                                 "category":  18,
                                                                  "nameResourceKey":  "blockSafariName",
                                                                  "descriptionResourceKey":  "blockSafariDescription",
                                                                  "childSettings":  [
@@ -438,12 +467,12 @@
                                                                  "entityKey":  "safariBlocked",
                                                                  "booleanActions":  9,
                                                                  "defaultValue":  false,
-                                                                 "policyType":  45,
+                                                                 "policyType":  46,
                                                                  "enabled":  true
                                                              },
                                                              {
                                                                  "dataType":  0,
-                                                                 "category":  16,
+                                                                 "category":  18,
                                                                  "nameResourceKey":  "blockIosSafariAutofillName",
                                                                  "childSettings":  [
 
@@ -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

@@ -1,15 +1,15 @@
-{
+{
     "builtinapps_macgeneral":  {
                                    "isSettingDescription":  false,
                                    "showAsSectionHeader":  true,
                                    "dataType":  8,
-                                   "category":  16,
+                                   "category":  18,
                                    "nameResourceKey":  "allEnrollmentTypesHeaderNameMac",
                                    "descriptionResourceKey":  "allEnrollmentTypesHeaderDescriptionMac",
                                    "childSettings":  [
                                                          {
                                                              "dataType":  0,
-                                                             "category":  16,
+                                                             "category":  18,
                                                              "nameResourceKey":  "blockSafariAutofillName",
                                                              "descriptionResourceKey":  "blockSafariAutofillDescription",
                                                              "childSettings":  [
@@ -21,12 +21,12 @@
                                                              "entityKey":  "safariBlockAutofill",
                                                              "booleanActions":  9,
                                                              "defaultValue":  false,
-                                                             "policyType":  60,
+                                                             "policyType":  61,
                                                              "enabled":  true
                                                          },
                                                          {
                                                              "dataType":  0,
-                                                             "category":  16,
+                                                             "category":  18,
                                                              "nameResourceKey":  "blockCameraNameMacOS",
                                                              "descriptionResourceKey":  "blockCameraDescriptionMacOS",
                                                              "childSettings":  [
@@ -38,12 +38,12 @@
                                                              "entityKey":  "cameraBlocked",
                                                              "booleanActions":  9,
                                                              "defaultValue":  false,
-                                                             "policyType":  60,
+                                                             "policyType":  61,
                                                              "enabled":  true
                                                          },
                                                          {
                                                              "dataType":  0,
-                                                             "category":  16,
+                                                             "category":  18,
                                                              "nameResourceKey":  "blockITunesMusicServiceNameMacOS",
                                                              "childSettings":  [
 
@@ -54,12 +54,12 @@
                                                              "entityKey":  "iTunesBlockMusicService",
                                                              "booleanActions":  9,
                                                              "defaultValue":  false,
-                                                             "policyType":  60,
+                                                             "policyType":  61,
                                                              "enabled":  true
                                                          },
                                                          {
                                                              "dataType":  0,
-                                                             "category":  16,
+                                                             "category":  18,
                                                              "nameResourceKey":  "blockSpotlightInternetResultsNameMacOS",
                                                              "descriptionResourceKey":  "blockSpotlightInternetResultsDescription",
                                                              "childSettings":  [
@@ -71,12 +71,12 @@
                                                              "entityKey":  "spotlightBlockInternetResults",
                                                              "booleanActions":  9,
                                                              "defaultValue":  false,
-                                                             "policyType":  60,
+                                                             "policyType":  61,
                                                              "enabled":  true
                                                          },
                                                          {
                                                              "dataType":  0,
-                                                             "category":  16,
+                                                             "category":  18,
                                                              "nameResourceKey":  "blockITunesFileSharingName",
                                                              "descriptionResourceKey":  "blockITunesFileSharingDescription",
                                                              "childSettings":  [
@@ -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/cameras_windows10devicefirmwareconfigurationinterface.json

@@ -0,0 +1,146 @@
+{
+    "cameras_windows10devicefirmwareconfigurationinterface":  [
+                                                                  {
+                                                                      "dataType":  16,
+                                                                      "category":  19,
+                                                                      "nameResourceKey":  "camerasName",
+                                                                      "descriptionResourceKey":  "camerasDescription",
+                                                                      "childSettings":  [
+
+                                                                                        ],
+                                                                      "options":  [
+                                                                                      {
+                                                                                          "nameResourceKey":  "notConfigured",
+                                                                                          "value":  "notConfigured",
+                                                                                          "enabled":  true
+                                                                                      },
+                                                                                      {
+                                                                                          "nameResourceKey":  "enabledOption",
+                                                                                          "value":  "enabled",
+                                                                                          "enabled":  true
+                                                                                      },
+                                                                                      {
+                                                                                          "nameResourceKey":  "disabledOption",
+                                                                                          "value":  "disabled",
+                                                                                          "enabled":  true
+                                                                                      }
+                                                                                  ],
+                                                                      "entityKey":  "cameras",
+                                                                      "booleanActions":  0,
+                                                                      "defaultValue":  "notConfigured",
+                                                                      "unconfiguredValue":  "notConfigured",
+                                                                      "policyType":  108,
+                                                                      "enabled":  true
+                                                                  },
+                                                                  {
+                                                                      "dataType":  10,
+                                                                      "category":  19,
+                                                                      "nameResourceKey":  "dfciGranularSettingsWarningInfoBox",
+                                                                      "childSettings":  [
+
+                                                                                        ],
+                                                                      "options":  [
+
+                                                                                  ],
+                                                                      "booleanActions":  0,
+                                                                      "policyType":  108,
+                                                                      "enabled":  true
+                                                                  },
+                                                                  {
+                                                                      "dataType":  16,
+                                                                      "category":  19,
+                                                                      "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":  "frontCamera",
+                                                                      "booleanActions":  0,
+                                                                      "defaultValue":  "notConfigured",
+                                                                      "unconfiguredValue":  "notConfigured",
+                                                                      "policyType":  108,
+                                                                      "enabled":  false
+                                                                  },
+                                                                  {
+                                                                      "dataType":  16,
+                                                                      "category":  19,
+                                                                      "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":  "rearCamera",
+                                                                      "booleanActions":  0,
+                                                                      "defaultValue":  "notConfigured",
+                                                                      "unconfiguredValue":  "notConfigured",
+                                                                      "policyType":  108,
+                                                                      "enabled":  false
+                                                                  },
+                                                                  {
+                                                                      "dataType":  16,
+                                                                      "category":  19,
+                                                                      "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":  "infraredCamera",
+                                                                      "booleanActions":  0,
+                                                                      "defaultValue":  "notConfigured",
+                                                                      "unconfiguredValue":  "notConfigured",
+                                                                      "policyType":  108,
+                                                                      "enabled":  false
+                                                                  }
+                                                              ]
+}

Documentation/ObjectInfo/cellular_windows8general.json

@@ -1,7 +1,7 @@
-{
+{
     "cellular_windows8general":  {
                                      "dataType":  0,
-                                     "category":  17,
+                                     "category":  20,
                                      "nameResourceKey":  "blockDataRoamingName",
                                      "descriptionResourceKey":  "blockDataRoamingDescription",
                                      "childSettings":  [
@@ -13,7 +13,7 @@
                                      "entityKey":  "cellularBlockDataRoaming",
                                      "booleanActions":  3,
                                      "defaultValue":  false,
-                                     "policyType":  91,
+                                     "policyType":  92,
                                      "enabled":  true
                                  }
 }

Documentation/ObjectInfo/cloudandstorage_androidgeneral.json

@@ -1,8 +1,8 @@
-{
+{
     "cloudandstorage_androidgeneral":  [
                                            {
                                                "dataType":  0,
-                                               "category":  18,
+                                               "category":  21,
                                                "nameResourceKey":  "blockGoogleBackupName",
                                                "descriptionResourceKey":  "blockGoogleBackupDescription",
                                                "childSettings":  [
@@ -19,7 +19,7 @@
                                            },
                                            {
                                                "dataType":  0,
-                                               "category":  18,
+                                               "category":  21,
                                                "nameResourceKey":  "blockGoogleAccountAutoSyncName",
                                                "descriptionResourceKey":  "blockGoogleAccountAutoSyncDescription",
                                                "childSettings":  [
@@ -36,7 +36,7 @@
                                            },
                                            {
                                                "dataType":  0,
-                                               "category":  18,
+                                               "category":  21,
                                                "nameResourceKey":  "knoxBlockRemovableStorageName",
                                                "descriptionResourceKey":  "BlockRemovableStorageAndroidDescription",
                                                "childSettings":  [
@@ -53,7 +53,7 @@
                                            },
                                            {
                                                "dataType":  0,
-                                               "category":  18,
+                                               "category":  21,
                                                "nameResourceKey":  "knoxRequireEncryptionOnRemovableStorageName",
                                                "descriptionResourceKey":  "knoxRequireEncryptionOnRemovableStorageDescription",
                                                "childSettings":  [

Documentation/ObjectInfo/cloudandstorage_iosgeneral.json

@@ -1,16 +1,16 @@
-{
+{
     "cloudandstorage_iosgeneral":  [
                                        {
                                            "isSettingDescription":  false,
                                            "showAsSectionHeader":  true,
                                            "dataType":  8,
-                                           "category":  18,
+                                           "category":  21,
                                            "nameResourceKey":  "allEnrollmentTypesHeaderName",
                                            "descriptionResourceKey":  "allEnrollmentTypesHeaderDescription",
                                            "childSettings":  [
                                                                  {
                                                                      "dataType":  0,
-                                                                     "category":  18,
+                                                                     "category":  21,
                                                                      "nameResourceKey":  "requireEncryptedBackupName",
                                                                      "descriptionResourceKey":  "requireEncryptedBackupDescription",
                                                                      "childSettings":  [
@@ -22,12 +22,12 @@
                                                                      "entityKey":  "iCloudRequireEncryptedBackup",
                                                                      "booleanActions":  9,
                                                                      "defaultValue":  false,
-                                                                     "policyType":  45,
+                                                                     "policyType":  46,
                                                                      "enabled":  true
                                                                  },
                                                                  {
                                                                      "dataType":  0,
-                                                                     "category":  18,
+                                                                     "category":  21,
                                                                      "nameResourceKey":  "blockManagedAppsCloudSyncName",
                                                                      "descriptionResourceKey":  "blockManagedAppsCloudSyncDescription",
                                                                      "childSettings":  [
@@ -39,12 +39,12 @@
                                                                      "entityKey":  "iCloudBlockManagedAppsSync",
                                                                      "booleanActions":  9,
                                                                      "defaultValue":  false,
-                                                                     "policyType":  45,
+                                                                     "policyType":  46,
                                                                      "enabled":  true
                                                                  },
                                                                  {
                                                                      "dataType":  0,
-                                                                     "category":  18,
+                                                                     "category":  21,
                                                                      "nameResourceKey":  "blockEnterpriseBookBackupName",
                                                                      "childSettings":  [
 
@@ -55,12 +55,12 @@
                                                                      "entityKey":  "enterpriseBookBlockBackup",
                                                                      "booleanActions":  9,
                                                                      "defaultValue":  false,
-                                                                     "policyType":  45,
+                                                                     "policyType":  46,
                                                                      "enabled":  true
                                                                  },
                                                                  {
                                                                      "dataType":  0,
-                                                                     "category":  18,
+                                                                     "category":  21,
                                                                      "nameResourceKey":  "blockEnterpriseBookMetadataSyncName",
                                                                      "childSettings":  [
 
@@ -71,7 +71,7 @@
                                                                      "entityKey":  "enterpriseBookBlockMetadataSync",
                                                                      "booleanActions":  9,
                                                                      "defaultValue":  false,
-                                                                     "policyType":  45,
+                                                                     "policyType":  46,
                                                                      "enabled":  true
                                                                  }
                                                              ],
@@ -79,20 +79,20 @@
 
                                                        ],
                                            "booleanActions":  0,
-                                           "policyType":  45,
+                                           "policyType":  46,
                                            "enabled":  true
                                        },
                                        {
                                            "isSettingDescription":  false,
                                            "showAsSectionHeader":  true,
                                            "dataType":  8,
-                                           "category":  18,
+                                           "category":  21,
                                            "nameResourceKey":  "deviceEnrollmentAndAutomatedDeviceEnrollmentHeaderName",
                                            "descriptionResourceKey":  "deviceEnrollmentAndAutomatedDeviceEnrollmentHeaderDescription",
                                            "childSettings":  [
                                                                  {
                                                                      "dataType":  0,
-                                                                     "category":  18,
+                                                                     "category":  21,
                                                                      "nameResourceKey":  "blockICloudPhotoStreamSyncName",
                                                                      "descriptionResourceKey":  "blockICloudPhotoStreamSyncDescription",
                                                                      "childSettings":  [
@@ -104,12 +104,12 @@
                                                                      "entityKey":  "iCloudBlockPhotoStreamSync",
                                                                      "booleanActions":  9,
                                                                      "defaultValue":  false,
-                                                                     "policyType":  45,
+                                                                     "policyType":  46,
                                                                      "enabled":  true
                                                                  },
                                                                  {
                                                                      "dataType":  0,
-                                                                     "category":  18,
+                                                                     "category":  21,
                                                                      "nameResourceKey":  "blockICloudPhotoLibraryName",
                                                                      "descriptionResourceKey":  "blockICloudPhotoLibraryDescription",
                                                                      "childSettings":  [
@@ -121,12 +121,12 @@
                                                                      "entityKey":  "iCloudBlockPhotoLibrary",
                                                                      "booleanActions":  9,
                                                                      "defaultValue":  false,
-                                                                     "policyType":  45,
+                                                                     "policyType":  46,
                                                                      "enabled":  true
                                                                  },
                                                                  {
                                                                      "dataType":  0,
-                                                                     "category":  18,
+                                                                     "category":  21,
                                                                      "nameResourceKey":  "blockSharedPhotoStreamName",
                                                                      "descriptionResourceKey":  "blockSharedPhotoStreamDescription",
                                                                      "childSettings":  [
@@ -138,12 +138,12 @@
                                                                      "entityKey":  "iCloudBlockSharedPhotoStream",
                                                                      "booleanActions":  9,
                                                                      "defaultValue":  false,
-                                                                     "policyType":  45,
+                                                                     "policyType":  46,
                                                                      "enabled":  true
                                                                  },
                                                                  {
                                                                      "dataType":  0,
-                                                                     "category":  18,
+                                                                     "category":  21,
                                                                      "nameResourceKey":  "blockIosActivityContinuationName",
                                                                      "descriptionResourceKey":  "blockIosActivityContinuationDescription",
                                                                      "childSettings":  [
@@ -155,7 +155,7 @@
                                                                      "entityKey":  "iCloudBlockActivityContinuation",
                                                                      "booleanActions":  9,
                                                                      "defaultValue":  false,
-                                                                     "policyType":  45,
+                                                                     "policyType":  46,
                                                                      "enabled":  true
                                                                  }
                                                              ],
@@ -163,20 +163,20 @@
 
                                                        ],
                                            "booleanActions":  0,
-                                           "policyType":  45,
+                                           "policyType":  46,
                                            "enabled":  true
                                        },
                                        {
                                            "isSettingDescription":  false,
                                            "showAsSectionHeader":  true,
                                            "dataType":  8,
-                                           "category":  18,
+                                           "category":  21,
                                            "nameResourceKey":  "automatedDeviceEnrollmentHeaderName",
                                            "descriptionResourceKey":  "automatedDeviceEnrollmentHeaderDescription",
                                            "childSettings":  [
                                                                  {
                                                                      "dataType":  0,
-                                                                     "category":  18,
+                                                                     "category":  21,
                                                                      "nameResourceKey":  "blockICloudBackupName",
                                                                      "descriptionResourceKey":  "blockICloudBackupDescription",
                                                                      "childSettings":  [
@@ -188,12 +188,12 @@
                                                                      "entityKey":  "iCloudBlockBackup",
                                                                      "booleanActions":  9,
                                                                      "defaultValue":  false,
-                                                                     "policyType":  45,
+                                                                     "policyType":  46,
                                                                      "enabled":  true
                                                                  },
                                                                  {
                                                                      "dataType":  0,
-                                                                     "category":  18,
+                                                                     "category":  21,
                                                                      "nameResourceKey":  "blockIosICloudDocumentSyncName",
                                                                      "descriptionResourceKey":  "blockIosICloudDocumentSyncDescription",
                                                                      "childSettings":  [
@@ -205,12 +205,12 @@
                                                                      "entityKey":  "iCloudBlockDocumentSync",
                                                                      "booleanActions":  9,
                                                                      "defaultValue":  false,
-                                                                     "policyType":  45,
+                                                                     "policyType":  46,
                                                                      "enabled":  true
                                                                  },
                                                                  {
                                                                      "dataType":  0,
-                                                                     "category":  18,
+                                                                     "category":  21,
                                                                      "nameResourceKey":  "blockIosKeychainCloudSyncName",
                                                                      "descriptionResourceKey":  "blockIosKeychainCloudSyncDescription",
                                                                      "childSettings":  [
@@ -222,7 +222,24 @@
                                                                      "entityKey":  "keychainBlockCloudSync",
                                                                      "booleanActions":  9,
                                                                      "defaultValue":  false,
-                                                                     "policyType":  45,
+                                                                     "policyType":  46,
+                                                                     "enabled":  true
+                                                                 },
+                                                                 {
+                                                                     "dataType":  0,
+                                                                     "category":  21,
+                                                                     "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,15 +1,16 @@
-{
-    "cloudandstorage_macgeneral":  {
+{
+    "cloudandstorage_macgeneral":  [
+                                       {
                                            "isSettingDescription":  false,
                                            "showAsSectionHeader":  true,
                                            "dataType":  8,
-                                       "category":  18,
+                                           "category":  21,
                                            "nameResourceKey":  "allEnrollmentTypesHeaderNameMac",
                                            "descriptionResourceKey":  "allEnrollmentTypesHeaderDescriptionMac",
                                            "childSettings":  [
                                                                  {
                                                                      "dataType":  0,
-                                                                 "category":  18,
+                                                                     "category":  21,
                                                                      "nameResourceKey":  "blockKeychainCloudSyncName",
                                                                      "descriptionResourceKey":  "blockKeychainCloudSyncDescription",
                                                                      "childSettings":  [
@@ -21,12 +22,29 @@
                                                                      "entityKey":  "keychainBlockCloudSync",
                                                                      "booleanActions":  9,
                                                                      "defaultValue":  false,
-                                                                 "policyType":  60,
+                                                                     "policyType":  61,
                                                                      "enabled":  true
                                                                  },
                                                                  {
                                                                      "dataType":  0,
-                                                                 "category":  18,
+                                                                     "category":  21,
+                                                                     "nameResourceKey":  "blockICloudDesktopAndDocumentsName",
+                                                                     "descriptionResourceKey":  "blockICloudDesktopAndDocumentsDescription",
+                                                                     "childSettings":  [
+
+                                                                                       ],
+                                                                     "options":  [
+
+                                                                                 ],
+                                                                     "entityKey":  "iCloudDesktopAndDocumentsBlocked",
+                                                                     "booleanActions":  9,
+                                                                     "defaultValue":  false,
+                                                                     "policyType":  61,
+                                                                     "enabled":  true
+                                                                 },
+                                                                 {
+                                                                     "dataType":  0,
+                                                                     "category":  21,
                                                                      "nameResourceKey":  "blockICloudDocumentSyncName",
                                                                      "descriptionResourceKey":  "blockICloudDocumentSyncDescription",
                                                                      "childSettings":  [
@@ -38,12 +56,12 @@
                                                                      "entityKey":  "iCloudBlockDocumentSync",
                                                                      "booleanActions":  9,
                                                                      "defaultValue":  false,
-                                                                 "policyType":  60,
+                                                                     "policyType":  61,
                                                                      "enabled":  true
                                                                  },
                                                                  {
                                                                      "dataType":  0,
-                                                                 "category":  18,
+                                                                     "category":  21,
                                                                      "nameResourceKey":  "blockICloudMailName",
                                                                      "descriptionResourceKey":  "blockICloudMailDescription",
                                                                      "childSettings":  [
@@ -55,12 +73,12 @@
                                                                      "entityKey":  "iCloudBlockMail",
                                                                      "booleanActions":  9,
                                                                      "defaultValue":  false,
-                                                                 "policyType":  60,
+                                                                     "policyType":  61,
                                                                      "enabled":  true
                                                                  },
                                                                  {
                                                                      "dataType":  0,
-                                                                 "category":  18,
+                                                                     "category":  21,
                                                                      "nameResourceKey":  "blockICloudAddressBookName",
                                                                      "descriptionResourceKey":  "blockICloudAddressBookDescription",
                                                                      "childSettings":  [
@@ -72,12 +90,12 @@
                                                                      "entityKey":  "iCloudBlockAddressBook",
                                                                      "booleanActions":  9,
                                                                      "defaultValue":  false,
-                                                                 "policyType":  60,
+                                                                     "policyType":  61,
                                                                      "enabled":  true
                                                                  },
                                                                  {
                                                                      "dataType":  0,
-                                                                 "category":  18,
+                                                                     "category":  21,
                                                                      "nameResourceKey":  "blockICloudCalendarName",
                                                                      "descriptionResourceKey":  "blockICloudCalendarDescription",
                                                                      "childSettings":  [
@@ -89,12 +107,12 @@
                                                                      "entityKey":  "iCloudBlockCalendar",
                                                                      "booleanActions":  9,
                                                                      "defaultValue":  false,
-                                                                 "policyType":  60,
+                                                                     "policyType":  61,
                                                                      "enabled":  true
                                                                  },
                                                                  {
                                                                      "dataType":  0,
-                                                                 "category":  18,
+                                                                     "category":  21,
                                                                      "nameResourceKey":  "blockICloudRemindersName",
                                                                      "descriptionResourceKey":  "blockICloudRemindersDescription",
                                                                      "childSettings":  [
@@ -106,12 +124,12 @@
                                                                      "entityKey":  "iCloudBlockReminders",
                                                                      "booleanActions":  9,
                                                                      "defaultValue":  false,
-                                                                 "policyType":  60,
+                                                                     "policyType":  61,
                                                                      "enabled":  true
                                                                  },
                                                                  {
                                                                      "dataType":  0,
-                                                                 "category":  18,
+                                                                     "category":  21,
                                                                      "nameResourceKey":  "blockICloudBookmarksName",
                                                                      "descriptionResourceKey":  "blockICloudBookmarksDescription",
                                                                      "childSettings":  [
@@ -123,12 +141,12 @@
                                                                      "entityKey":  "iCloudBlockBookmarks",
                                                                      "booleanActions":  9,
                                                                      "defaultValue":  false,
-                                                                 "policyType":  60,
+                                                                     "policyType":  61,
                                                                      "enabled":  true
                                                                  },
                                                                  {
                                                                      "dataType":  0,
-                                                                 "category":  18,
+                                                                     "category":  21,
                                                                      "nameResourceKey":  "blockICloudNotesName",
                                                                      "descriptionResourceKey":  "blockICloudNotesDescription",
                                                                      "childSettings":  [
@@ -140,12 +158,12 @@
                                                                      "entityKey":  "iCloudBlockNotes",
                                                                      "booleanActions":  9,
                                                                      "defaultValue":  false,
-                                                                 "policyType":  60,
+                                                                     "policyType":  61,
                                                                      "enabled":  true
                                                                  },
                                                                  {
                                                                      "dataType":  0,
-                                                                 "category":  18,
+                                                                     "category":  21,
                                                                      "nameResourceKey":  "MacBlockICloudPhotoLibraryName",
                                                                      "descriptionResourceKey":  "blockICloudPhotoLibraryDescription",
                                                                      "childSettings":  [
@@ -157,12 +175,12 @@
                                                                      "entityKey":  "iCloudBlockPhotoLibrary",
                                                                      "booleanActions":  9,
                                                                      "defaultValue":  false,
-                                                                 "policyType":  60,
+                                                                     "policyType":  61,
                                                                      "enabled":  true
                                                                  },
                                                                  {
                                                                      "dataType":  0,
-                                                                 "category":  18,
+                                                                     "category":  21,
                                                                      "nameResourceKey":  "blockMacActivityContinuationName",
                                                                      "descriptionResourceKey":  "blockMacActivityContinuationDescription",
                                                                      "childSettings":  [
@@ -174,7 +192,7 @@
                                                                      "entityKey":  "iCloudBlockActivityContinuation",
                                                                      "booleanActions":  9,
                                                                      "defaultValue":  false,
-                                                                 "policyType":  60,
+                                                                     "policyType":  61,
                                                                      "enabled":  true
                                                                  }
                                                              ],
@@ -182,7 +200,41 @@
 
                                                        ],
                                            "booleanActions":  0,
-                                       "policyType":  60,
+                                           "policyType":  61,
+                                           "enabled":  true
+                                       },
+                                       {
+                                           "isSettingDescription":  false,
+                                           "showAsSectionHeader":  true,
+                                           "dataType":  8,
+                                           "category":  21,
+                                           "nameResourceKey":  "userApprovedAndAutomatedDeviceEnrollmentHeaderNameMac",
+                                           "descriptionResourceKey":  "userApprovedAndAutomatedDeviceEnrollmentHeaderDescriptionMac",
+                                           "childSettings":  [
+                                                                 {
+                                                                     "dataType":  0,
+                                                                     "category":  21,
+                                                                     "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

@@ -1,8 +1,8 @@
-{
+{
     "cloudandstorage_windows10general":  [
                                              {
                                                  "dataType":  0,
-                                                 "category":  18,
+                                                 "category":  21,
                                                  "nameResourceKey":  "blockMicrosoftAccountName",
                                                  "descriptionResourceKey":  "blockMicrosoftAccountDescription",
                                                  "childSettings":  [
@@ -14,12 +14,12 @@
                                                  "entityKey":  "microsoftAccountBlocked",
                                                  "booleanActions":  3,
                                                  "defaultValue":  false,
-                                                 "policyType":  78,
+                                                 "policyType":  79,
                                                  "enabled":  true
                                              },
                                              {
                                                  "dataType":  0,
-                                                 "category":  18,
+                                                 "category":  21,
                                                  "nameResourceKey":  "blockNonMicrosoftAccountName",
                                                  "descriptionResourceKey":  "blockNonMicrosoftAccountDescription",
                                                  "childSettings":  [
@@ -31,12 +31,12 @@
                                                  "entityKey":  "accountsBlockAddingNonMicrosoftAccountEmail",
                                                  "booleanActions":  3,
                                                  "defaultValue":  false,
-                                                 "policyType":  78,
+                                                 "policyType":  79,
                                                  "enabled":  true
                                              },
                                              {
                                                  "dataType":  0,
-                                                 "category":  18,
+                                                 "category":  21,
                                                  "nameResourceKey":  "blockSettingsSynchronizationForMicrosoftAccountName",
                                                  "descriptionResourceKey":  "blockSettingsSynchronizationForMicrosoftAccountDescription",
                                                  "childSettings":  [
@@ -48,12 +48,12 @@
                                                  "entityKey":  "microsoftAccountBlockSettingsSync",
                                                  "booleanActions":  3,
                                                  "defaultValue":  false,
-                                                 "policyType":  78,
+                                                 "policyType":  79,
                                                  "enabled":  true
                                              },
                                              {
                                                  "dataType":  16,
-                                                 "category":  18,
+                                                 "category":  21,
                                                  "nameResourceKey":  "AccountsSignInAssistantSettingsName",
                                                  "descriptionResourceKey":  "AccountsSignInAssistantSettingsDescription",
                                                  "childSettings":  [
@@ -75,7 +75,7 @@
                                                  "booleanActions":  0,
                                                  "defaultValue":  "notConfigured",
                                                  "unconfiguredValue":  "notConfigured",
-                                                 "policyType":  78,
+                                                 "policyType":  79,
                                                  "enabled":  true
                                              }
                                          ]

Documentation/ObjectInfo/cloudandstorage_windows8general.json

@@ -1,8 +1,8 @@
-{
+{
     "cloudandstorage_windows8general":  [
                                             {
                                                 "dataType":  20,
-                                                "category":  18,
+                                                "category":  21,
                                                 "nameResourceKey":  "workFoldersURLName",
                                                 "descriptionResourceKey":  "workFoldersURLDescription",
                                                 "childSettings":  [
@@ -13,12 +13,12 @@
                                                             ],
                                                 "entityKey":  "workFoldersUrl",
                                                 "booleanActions":  0,
-                                                "policyType":  91,
+                                                "policyType":  92,
                                                 "enabled":  true
                                             },
                                             {
                                                 "dataType":  0,
-                                                "category":  18,
+                                                "category":  21,
                                                 "nameResourceKey":  "microsoftAccountOptionalForMailName",
                                                 "descriptionResourceKey":  "microsoftAccountOptionalForMailDescription",
                                                 "childSettings":  [
@@ -30,7 +30,7 @@
                                                 "entityKey":  "accountsBlockAddingNonMicrosoftAccountEmail",
                                                 "booleanActions":  3,
                                                 "defaultValue":  false,
-                                                "policyType":  91,
+                                                "policyType":  92,
                                                 "enabled":  true
                                             }
                                         ]

Documentation/ObjectInfo/cloudprint_windows10general.json

@@ -1,8 +1,8 @@
-{
+{
     "cloudprint_windows10general":  [
                                         {
                                             "dataType":  20,
-                                            "category":  19,
+                                            "category":  22,
                                             "nameResourceKey":  "cloudPrintDiscoveryEndPointName",
                                             "descriptionResourceKey":  "cloudPrintDiscoveryEndPointDescription",
                                             "emptyValueResourceKey":  "cloudPrintDiscoveryEndPointExample",
@@ -16,12 +16,12 @@
                                             "booleanActions":  0,
                                             "defaultValue":  "",
                                             "unconfiguredValue":  "",
-                                            "policyType":  78,
+                                            "policyType":  79,
                                             "enabled":  true
                                         },
                                         {
                                             "dataType":  20,
-                                            "category":  19,
+                                            "category":  22,
                                             "nameResourceKey":  "cloudPrintOAuthAuthorityName",
                                             "descriptionResourceKey":  "cloudPrintOAuthAuthorityDescription",
                                             "emptyValueResourceKey":  "cloudPrintOAuthAuthorityExample",
@@ -35,12 +35,12 @@
                                             "booleanActions":  0,
                                             "defaultValue":  "",
                                             "unconfiguredValue":  "",
-                                            "policyType":  78,
+                                            "policyType":  79,
                                             "enabled":  true
                                         },
                                         {
                                             "dataType":  20,
-                                            "category":  19,
+                                            "category":  22,
                                             "nameResourceKey":  "cloudPrintOAuthClientIdName",
                                             "descriptionResourceKey":  "cloudPrintOAuthClientIdDescription",
                                             "emptyValueResourceKey":  "cloudPrintOAuthClientIdExample",
@@ -54,12 +54,12 @@
                                             "booleanActions":  0,
                                             "defaultValue":  "",
                                             "unconfiguredValue":  "",
-                                            "policyType":  78,
+                                            "policyType":  79,
                                             "enabled":  true
                                         },
                                         {
                                             "dataType":  20,
-                                            "category":  19,
+                                            "category":  22,
                                             "nameResourceKey":  "cloudPrintResourceIdName",
                                             "descriptionResourceKey":  "cloudPrintResourceIdDescription",
                                             "emptyValueResourceKey":  "cloudPrintResourceIdExample",
@@ -73,12 +73,12 @@
                                             "booleanActions":  0,
                                             "defaultValue":  "",
                                             "unconfiguredValue":  "",
-                                            "policyType":  78,
+                                            "policyType":  79,
                                             "enabled":  true
                                         },
                                         {
                                             "dataType":  14,
-                                            "category":  19,
+                                            "category":  22,
                                             "nameResourceKey":  "cloudPrintDiscoveryMaxLimitName",
                                             "descriptionResourceKey":  "cloudPrintDiscoveryMaxLimitDescription",
                                             "emptyValueResourceKey":  "cloudPrintDiscoveryMaxLimitExample",
@@ -90,12 +90,12 @@
                                                         ],
                                             "entityKey":  "enterpriseCloudPrintDiscoveryMaxLimit",
                                             "booleanActions":  0,
-                                            "policyType":  78,
+                                            "policyType":  79,
                                             "enabled":  true
                                         },
                                         {
                                             "dataType":  20,
-                                            "category":  19,
+                                            "category":  22,
                                             "nameResourceKey":  "mopriaDiscoveryResourceIdName",
                                             "descriptionResourceKey":  "mopriaDiscoveryResourceIdDescription",
                                             "emptyValueResourceKey":  "mopriaDiscoveryResourceIdExample",
@@ -109,7 +109,7 @@
                                             "booleanActions":  0,
                                             "defaultValue":  "",
                                             "unconfiguredValue":  "",
-                                            "policyType":  78,
+                                            "policyType":  79,
                                             "enabled":  true
                                         }
                                     ]

Documentation/ObjectInfo/complianceemailprofile_complianceios.json

@@ -1,14 +1,14 @@
-{
+{
     "complianceemailprofile_complianceios":  {
                                                  "isSettingDescription":  false,
                                                  "showAsSectionHeader":  false,
                                                  "dataType":  8,
-                                                 "category":  62,
+                                                 "category":  66,
                                                  "nameResourceKey":  "complianceEmailProfileHeader",
                                                  "childSettings":  [
                                                                        {
                                                                            "dataType":  0,
-                                                                           "category":  62,
+                                                                           "category":  66,
                                                                            "nameResourceKey":  "complianceEmailProfileRequired",
                                                                            "descriptionResourceKey":  "complianceEmailProfileRequiredDescription",
                                                                            "childSettings":  [

Documentation/ObjectInfo/connecteddevices_iosgeneral.json

@@ -1,16 +1,16 @@
-{
+{
     "connecteddevices_iosgeneral":  [
                                         {
                                             "isSettingDescription":  false,
                                             "showAsSectionHeader":  true,
                                             "dataType":  8,
-                                            "category":  20,
+                                            "category":  23,
                                             "nameResourceKey":  "allEnrollmentTypesHeaderName",
                                             "descriptionResourceKey":  "allEnrollmentTypesHeaderDescription",
                                             "childSettings":  [
                                                                   {
                                                                       "dataType":  0,
-                                                                      "category":  20,
+                                                                      "category":  23,
                                                                       "nameResourceKey":  "forceWatchWristDetectionName",
                                                                       "descriptionResourceKey":  "forceWatchWristDetectionDescription",
                                                                       "childSettings":  [
@@ -22,7 +22,7 @@
                                                                       "entityKey":  "appleWatchForceWristDetection",
                                                                       "booleanActions":  9,
                                                                       "defaultValue":  false,
-                                                                      "policyType":  45,
+                                                                      "policyType":  46,
                                                                       "enabled":  true
                                                                   }
                                                               ],
@@ -30,20 +30,20 @@
 
                                                         ],
                                             "booleanActions":  0,
-                                            "policyType":  45,
+                                            "policyType":  46,
                                             "enabled":  true
                                         },
                                         {
                                             "isSettingDescription":  false,
                                             "showAsSectionHeader":  true,
                                             "dataType":  8,
-                                            "category":  20,
+                                            "category":  23,
                                             "nameResourceKey":  "deviceEnrollmentAndAutomatedDeviceEnrollmentHeaderName",
                                             "descriptionResourceKey":  "deviceEnrollmentAndAutomatedDeviceEnrollmentHeaderDescription",
                                             "childSettings":  [
                                                                   {
                                                                       "dataType":  0,
-                                                                      "category":  20,
+                                                                      "category":  23,
                                                                       "nameResourceKey":  "forceAirPlayOutgoingRequestsPairingPasswordName",
                                                                       "descriptionResourceKey":  "forceAirPlayOutgoingRequestsPairingPasswordDescription",
                                                                       "childSettings":  [
@@ -55,7 +55,24 @@
                                                                       "entityKey":  "airPlayForcePairingPasswordForOutgoingRequests",
                                                                       "booleanActions":  9,
                                                                       "defaultValue":  false,
-                                                                      "policyType":  45,
+                                                                      "policyType":  46,
+                                                                      "enabled":  true
+                                                                  },
+                                                                  {
+                                                                      "dataType":  0,
+                                                                      "category":  23,
+                                                                      "nameResourceKey":  "autoUnlockBlockedName",
+                                                                      "descriptionResourceKey":  "autoUnlockBlockedDescription",
+                                                                      "childSettings":  [
+
+                                                                                        ],
+                                                                      "options":  [
+
+                                                                                  ],
+                                                                      "entityKey":  "autoUnlockBlocked",
+                                                                      "booleanActions":  9,
+                                                                      "defaultValue":  false,
+                                                                      "policyType":  46,
                                                                       "enabled":  true
                                                                   }
                                                               ],
@@ -63,20 +80,20 @@
 
                                                         ],
                                             "booleanActions":  0,
-                                            "policyType":  45,
+                                            "policyType":  46,
                                             "enabled":  true
                                         },
                                         {
                                             "isSettingDescription":  false,
                                             "showAsSectionHeader":  true,
                                             "dataType":  8,
-                                            "category":  20,
+                                            "category":  23,
                                             "nameResourceKey":  "automatedDeviceEnrollmentHeaderName",
                                             "descriptionResourceKey":  "automatedDeviceEnrollmentHeaderDescription",
                                             "childSettings":  [
                                                                   {
                                                                       "dataType":  0,
-                                                                      "category":  20,
+                                                                      "category":  23,
                                                                       "nameResourceKey":  "blockAirDropName",
                                                                       "childSettings":  [
 
@@ -87,12 +104,12 @@
                                                                       "entityKey":  "airDropBlocked",
                                                                       "booleanActions":  9,
                                                                       "defaultValue":  false,
-                                                                      "policyType":  45,
+                                                                      "policyType":  46,
                                                                       "enabled":  true
                                                                   },
                                                                   {
                                                                       "dataType":  0,
-                                                                      "category":  20,
+                                                                      "category":  23,
                                                                       "nameResourceKey":  "blockAppleWatchPairingName",
                                                                       "childSettings":  [
 
@@ -103,12 +120,12 @@
                                                                       "entityKey":  "appleWatchBlockPairing",
                                                                       "booleanActions":  9,
                                                                       "defaultValue":  false,
-                                                                      "policyType":  45,
+                                                                      "policyType":  46,
                                                                       "enabled":  true
                                                                   },
                                                                   {
                                                                       "dataType":  0,
-                                                                      "category":  20,
+                                                                      "category":  23,
                                                                       "nameResourceKey":  "blockBluetoothModificationName",
                                                                       "descriptionResourceKey":  "blockBluetoothModificationDescription",
                                                                       "childSettings":  [
@@ -120,12 +137,12 @@
                                                                       "entityKey":  "bluetoothBlockModification",
                                                                       "booleanActions":  9,
                                                                       "defaultValue":  false,
-                                                                      "policyType":  45,
+                                                                      "policyType":  46,
                                                                       "enabled":  true
                                                                   },
                                                                   {
                                                                       "dataType":  0,
-                                                                      "category":  20,
+                                                                      "category":  23,
                                                                       "nameResourceKey":  "blockHostPairingName",
                                                                       "descriptionResourceKey":  "blockHostPairingDescription",
                                                                       "childSettings":  [
@@ -137,17 +154,17 @@
                                                                       "entityKey":  "hostPairingBlocked",
                                                                       "booleanActions":  9,
                                                                       "defaultValue":  false,
-                                                                      "policyType":  45,
+                                                                      "policyType":  46,
                                                                       "enabled":  true
                                                                   },
                                                                   {
                                                                       "dataType":  0,
-                                                                      "category":  20,
+                                                                      "category":  23,
                                                                       "nameResourceKey":  "blockAirPrintNameIOS",
                                                                       "childSettings":  [
                                                                                             {
                                                                                                 "dataType":  0,
-                                                                                                "category":  20,
+                                                                                                "category":  23,
                                                                                                 "nameResourceKey":  "blockAirPrintCredentialsStorageName",
                                                                                                 "descriptionResourceKey":  "blockAirPrintCredentialsStorageDescription",
                                                                                                 "childSettings":  [
@@ -159,12 +176,12 @@
                                                                                                 "entityKey":  "airPrintBlockCredentialsStorage",
                                                                                                 "booleanActions":  3,
                                                                                                 "defaultValue":  false,
-                                                                                                "policyType":  45,
+                                                                                                "policyType":  46,
                                                                                                 "enabled":  true
                                                                                             },
                                                                                             {
                                                                                                 "dataType":  0,
-                                                                                                "category":  20,
+                                                                                                "category":  23,
                                                                                                 "nameResourceKey":  "forceAirPrintTrustedTLSNameIOS",
                                                                                                 "descriptionResourceKey":  "forceAirPrintTrustedTLSDescriptionIOS",
                                                                                                 "childSettings":  [
@@ -176,12 +193,12 @@
                                                                                                 "entityKey":  "airPrintForceTrustedTLS",
                                                                                                 "booleanActions":  9,
                                                                                                 "defaultValue":  false,
-                                                                                                "policyType":  45,
+                                                                                                "policyType":  46,
                                                                                                 "enabled":  true
                                                                                             },
                                                                                             {
                                                                                                 "dataType":  0,
-                                                                                                "category":  20,
+                                                                                                "category":  23,
                                                                                                 "nameResourceKey":  "blockAirPrintiBeaconDiscoveryNameIOS",
                                                                                                 "descriptionResourceKey":  "blockAirPrintiBeaconDiscoveryDescription",
                                                                                                 "childSettings":  [
@@ -193,7 +210,7 @@
                                                                                                 "entityKey":  "airPrintBlockiBeaconDiscovery",
                                                                                                 "booleanActions":  9,
                                                                                                 "defaultValue":  false,
-                                                                                                "policyType":  45,
+                                                                                                "policyType":  46,
                                                                                                 "enabled":  true
                                                                                             }
                                                                                         ],
@@ -203,12 +220,12 @@
                                                                       "entityKey":  "airPrintBlocked",
                                                                       "booleanActions":  9,
                                                                       "defaultValue":  false,
-                                                                      "policyType":  45,
+                                                                      "policyType":  46,
                                                                       "enabled":  true
                                                                   },
                                                                   {
                                                                       "dataType":  0,
-                                                                      "category":  20,
+                                                                      "category":  23,
                                                                       "nameResourceKey":  "blockProximitySetupToNewDeviceName",
                                                                       "descriptionResourceKey":  "blockProximitySetupToNewDeviceDescription",
                                                                       "childSettings":  [
@@ -220,12 +237,12 @@
                                                                       "entityKey":  "proximityBlockSetupToNewDevice",
                                                                       "booleanActions":  9,
                                                                       "defaultValue":  false,
-                                                                      "policyType":  45,
+                                                                      "policyType":  46,
                                                                       "enabled":  true
                                                                   },
                                                                   {
                                                                       "dataType":  0,
-                                                                      "category":  20,
+                                                                      "category":  23,
                                                                       "nameResourceKey":  "blockFilesUsbDriveAccessName",
                                                                       "descriptionResourceKey":  "blockFilesUsbDriveAccessDescription",
                                                                       "childSettings":  [
@@ -237,12 +254,12 @@
                                                                       "entityKey":  "filesUsbDriveAccessBlocked",
                                                                       "booleanActions":  9,
                                                                       "defaultValue":  false,
-                                                                      "policyType":  45,
+                                                                      "policyType":  46,
                                                                       "enabled":  true
                                                                   },
                                                                   {
                                                                       "dataType":  0,
-                                                                      "category":  20,
+                                                                      "category":  23,
                                                                       "nameResourceKey":  "nfcBlockedName",
                                                                       "descriptionResourceKey":  "nfcBlockedDescription",
                                                                       "childSettings":  [
@@ -254,7 +271,24 @@
                                                                       "entityKey":  "nfcBlocked",
                                                                       "booleanActions":  9,
                                                                       "defaultValue":  false,
-                                                                      "policyType":  45,
+                                                                      "policyType":  46,
+                                                                      "enabled":  true
+                                                                  },
+                                                                  {
+                                                                      "dataType":  0,
+                                                                      "category":  23,
+                                                                      "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

@@ -1,15 +1,15 @@
-{
+{
     "connecteddevices_macgeneral":  {
                                         "isSettingDescription":  false,
                                         "showAsSectionHeader":  true,
                                         "dataType":  8,
-                                        "category":  20,
+                                        "category":  23,
                                         "nameResourceKey":  "allEnrollmentTypesHeaderNameMac",
                                         "descriptionResourceKey":  "allEnrollmentTypesHeaderDescriptionMac",
                                         "childSettings":  [
                                                               {
                                                                   "dataType":  0,
-                                                                  "category":  20,
+                                                                  "category":  23,
                                                                   "nameResourceKey":  "blockAirDropNameMacOS",
                                                                   "childSettings":  [
 
@@ -20,12 +20,12 @@
                                                                   "entityKey":  "airDropBlocked",
                                                                   "booleanActions":  9,
                                                                   "defaultValue":  false,
-                                                                  "policyType":  60,
+                                                                  "policyType":  61,
                                                                   "enabled":  true
                                                               },
                                                               {
                                                                   "dataType":  0,
-                                                                  "category":  20,
+                                                                  "category":  23,
                                                                   "nameResourceKey":  "blockAppleWatchAutoUnlockName",
                                                                   "descriptionResourceKey":  "blockAppleWatchAutoUnlockDescription",
                                                                   "childSettings":  [
@@ -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_androidgeneral.json

@@ -1,8 +1,8 @@
-{
+{
     "connectivity_androidgeneral":  [
                                         {
                                             "dataType":  0,
-                                            "category":  21,
+                                            "category":  24,
                                             "nameResourceKey":  "knoxBlockDataRoamingName",
                                             "descriptionResourceKey":  "BlockDataRoamingAndroidDescription",
                                             "childSettings":  [
@@ -19,7 +19,7 @@
                                         },
                                         {
                                             "dataType":  0,
-                                            "category":  21,
+                                            "category":  24,
                                             "nameResourceKey":  "blockSMSAndMMSName",
                                             "descriptionResourceKey":  "blockSMSAndMMSAndroidDescription",
                                             "childSettings":  [
@@ -36,7 +36,7 @@
                                         },
                                         {
                                             "dataType":  0,
-                                            "category":  21,
+                                            "category":  24,
                                             "nameResourceKey":  "knoxBlockVoiceDialingName",
                                             "descriptionResourceKey":  "blockVoiceDialingAndroidDescription",
                                             "childSettings":  [
@@ -53,7 +53,7 @@
                                         },
                                         {
                                             "dataType":  0,
-                                            "category":  21,
+                                            "category":  24,
                                             "nameResourceKey":  "knoxBlockVoiceRoamingName",
                                             "descriptionResourceKey":  "blockVoiceRoamingAndroidDescription",
                                             "childSettings":  [
@@ -70,7 +70,7 @@
                                         },
                                         {
                                             "dataType":  0,
-                                            "category":  21,
+                                            "category":  24,
                                             "nameResourceKey":  "knoxBlockBluetoothName",
                                             "descriptionResourceKey":  "blockBluetoothAndroidDescription",
                                             "childSettings":  [
@@ -87,7 +87,7 @@
                                         },
                                         {
                                             "dataType":  0,
-                                            "category":  21,
+                                            "category":  24,
                                             "nameResourceKey":  "knoxBlockNFCName",
                                             "descriptionResourceKey":  "blockNFCAndroidDescription",
                                             "childSettings":  [
@@ -104,7 +104,7 @@
                                         },
                                         {
                                             "dataType":  0,
-                                            "category":  21,
+                                            "category":  24,
                                             "nameResourceKey":  "knoxBlockWiFiName",
                                             "descriptionResourceKey":  "blockWiFiAndroidDescription",
                                             "childSettings":  [
@@ -121,7 +121,7 @@
                                         },
                                         {
                                             "dataType":  0,
-                                            "category":  21,
+                                            "category":  24,
                                             "nameResourceKey":  "knoxBlockWiFiTetheringName",
                                             "descriptionResourceKey":  "blockWiFiTetheringAndroidDescription",
                                             "childSettings":  [

Documentation/ObjectInfo/connectivity_windows10general.json

@@ -1,8 +1,8 @@
-{
+{
     "connectivity_windows10general":  [
                                           {
                                               "dataType":  16,
-                                              "category":  21,
+                                              "category":  24,
                                               "nameResourceKey":  "cellularDataName",
                                               "descriptionResourceKey":  "cellularDataDescription",
                                               "childSettings":  [
@@ -29,12 +29,12 @@
                                               "booleanActions":  0,
                                               "defaultValue":  "allowed",
                                               "unconfiguredValue":  "allowed",
-                                              "policyType":  78,
+                                              "policyType":  79,
                                               "enabled":  true
                                           },
                                           {
                                               "dataType":  0,
-                                              "category":  21,
+                                              "category":  24,
                                               "nameResourceKey":  "blockDataRoamingName",
                                               "descriptionResourceKey":  "blockDataRoamingDescription",
                                               "childSettings":  [
@@ -46,12 +46,12 @@
                                               "entityKey":  "cellularBlockDataWhenRoaming",
                                               "booleanActions":  3,
                                               "defaultValue":  false,
-                                              "policyType":  78,
+                                              "policyType":  79,
                                               "enabled":  true
                                           },
                                           {
                                               "dataType":  0,
-                                              "category":  21,
+                                              "category":  24,
                                               "nameResourceKey":  "vpnOverCellularName",
                                               "descriptionResourceKey":  "empty",
                                               "childSettings":  [
@@ -63,12 +63,12 @@
                                               "entityKey":  "cellularBlockVpn",
                                               "booleanActions":  3,
                                               "defaultValue":  false,
-                                              "policyType":  78,
+                                              "policyType":  79,
                                               "enabled":  true
                                           },
                                           {
                                               "dataType":  0,
-                                              "category":  21,
+                                              "category":  24,
                                               "nameResourceKey":  "vpnRoamingOverCellularName",
                                               "descriptionResourceKey":  "empty",
                                               "childSettings":  [
@@ -80,12 +80,12 @@
                                               "entityKey":  "cellularBlockVpnWhenRoaming",
                                               "booleanActions":  3,
                                               "defaultValue":  false,
-                                              "policyType":  78,
+                                              "policyType":  79,
                                               "enabled":  true
                                           },
                                           {
                                               "dataType":  0,
-                                              "category":  21,
+                                              "category":  24,
                                               "nameResourceKey":  "blockConnectedDevicesServiceName",
                                               "descriptionResourceKey":  "blockConnectedDevicesServiceDescription",
                                               "childSettings":  [
@@ -97,12 +97,12 @@
                                               "entityKey":  "connectedDevicesServiceBlocked",
                                               "booleanActions":  3,
                                               "defaultValue":  false,
-                                              "policyType":  78,
+                                              "policyType":  79,
                                               "enabled":  true
                                           },
                                           {
                                               "dataType":  0,
-                                              "category":  21,
+                                              "category":  24,
                                               "nameResourceKey":  "blockNFCName",
                                               "descriptionResourceKey":  "blockNFCDescription",
                                               "childSettings":  [
@@ -114,12 +114,12 @@
                                               "entityKey":  "nfcBlocked",
                                               "booleanActions":  3,
                                               "defaultValue":  false,
-                                              "policyType":  78,
+                                              "policyType":  79,
                                               "enabled":  true
                                           },
                                           {
                                               "dataType":  0,
-                                              "category":  21,
+                                              "category":  24,
                                               "nameResourceKey":  "blockWiFiName",
                                               "descriptionResourceKey":  "blockWiFiDescription",
                                               "childSettings":  [
@@ -131,12 +131,12 @@
                                               "entityKey":  "wiFiBlocked",
                                               "booleanActions":  3,
                                               "defaultValue":  false,
-                                              "policyType":  78,
+                                              "policyType":  79,
                                               "enabled":  true
                                           },
                                           {
                                               "dataType":  0,
-                                              "category":  21,
+                                              "category":  24,
                                               "nameResourceKey":  "blockWiFiHotspotAutoConnectName",
                                               "descriptionResourceKey":  "blockWiFiHotspotAutoConnectDescription",
                                               "childSettings":  [
@@ -148,12 +148,12 @@
                                               "entityKey":  "wiFiBlockAutomaticConnectHotspots",
                                               "booleanActions":  3,
                                               "defaultValue":  false,
-                                              "policyType":  78,
+                                              "policyType":  79,
                                               "enabled":  true
                                           },
                                           {
                                               "dataType":  0,
-                                              "category":  21,
+                                              "category":  24,
                                               "nameResourceKey":  "blockManualWifiConfigurationName",
                                               "descriptionResourceKey":  "blockManualWifiConfigurationDescription",
                                               "childSettings":  [
@@ -165,12 +165,12 @@
                                               "entityKey":  "wiFiBlockManualConfiguration",
                                               "booleanActions":  3,
                                               "defaultValue":  false,
-                                              "policyType":  78,
+                                              "policyType":  79,
                                               "enabled":  true
                                           },
                                           {
                                               "dataType":  14,
-                                              "category":  21,
+                                              "category":  24,
                                               "nameResourceKey":  "wiFiScanIntervalName",
                                               "descriptionResourceKey":  "wiFiScanIntervalDescription",
                                               "emptyValueResourceKey":  "wifiScanIntervalPlaceholder",
@@ -182,14 +182,14 @@
                                                           ],
                                               "entityKey":  "wiFiScanInterval",
                                               "booleanActions":  0,
-                                              "policyType":  78,
+                                              "policyType":  79,
                                               "enabled":  true
                                           },
                                           {
                                               "isSettingDescription":  false,
                                               "showAsSectionHeader":  false,
                                               "dataType":  8,
-                                              "category":  21,
+                                              "category":  24,
                                               "nameResourceKey":  "win10BluetoothHeader",
                                               "childSettings":  [
 
@@ -198,12 +198,12 @@
 
                                                           ],
                                               "booleanActions":  0,
-                                              "policyType":  78,
+                                              "policyType":  79,
                                               "enabled":  true
                                           },
                                           {
                                               "dataType":  0,
-                                              "category":  21,
+                                              "category":  24,
                                               "nameResourceKey":  "blockBluetoothName",
                                               "descriptionResourceKey":  "blockBluetoothDescription",
                                               "childSettings":  [
@@ -215,12 +215,12 @@
                                               "entityKey":  "bluetoothBlocked",
                                               "booleanActions":  3,
                                               "defaultValue":  false,
-                                              "policyType":  78,
+                                              "policyType":  79,
                                               "enabled":  true
                                           },
                                           {
                                               "dataType":  0,
-                                              "category":  21,
+                                              "category":  24,
                                               "nameResourceKey":  "blockBluetoothDiscoverableModeName",
                                               "descriptionResourceKey":  "blockBluetoothDiscoverableModeDescription",
                                               "childSettings":  [
@@ -232,12 +232,12 @@
                                               "entityKey":  "bluetoothBlockDiscoverableMode",
                                               "booleanActions":  3,
                                               "defaultValue":  false,
-                                              "policyType":  78,
+                                              "policyType":  79,
                                               "enabled":  true
                                           },
                                           {
                                               "dataType":  0,
-                                              "category":  21,
+                                              "category":  24,
                                               "nameResourceKey":  "blockBluetoothPrepairingName",
                                               "descriptionResourceKey":  "blockBluetoothPrepairingDescription",
                                               "childSettings":  [
@@ -249,12 +249,12 @@
                                               "entityKey":  "bluetoothBlockPrePairing",
                                               "booleanActions":  3,
                                               "defaultValue":  false,
-                                              "policyType":  78,
+                                              "policyType":  79,
                                               "enabled":  true
                                           },
                                           {
                                               "dataType":  0,
-                                              "category":  21,
+                                              "category":  24,
                                               "nameResourceKey":  "blockBluetoothAdvertisingName",
                                               "descriptionResourceKey":  "blockBluetoothAdvertisingDescription",
                                               "childSettings":  [
@@ -266,12 +266,12 @@
                                               "entityKey":  "bluetoothBlockAdvertising",
                                               "booleanActions":  3,
                                               "defaultValue":  false,
-                                              "policyType":  78,
+                                              "policyType":  79,
                                               "enabled":  true
                                           },
                                           {
                                               "dataType":  0,
-                                              "category":  21,
+                                              "category":  24,
                                               "nameResourceKey":  "bluetoothBlockPromptedProximalConnectionsName",
                                               "descriptionResourceKey":  "bluetoothBlockPromptedProximalConnectionsDescription",
                                               "childSettings":  [
@@ -284,7 +284,7 @@
                                               "booleanActions":  3,
                                               "defaultValue":  false,
                                               "unconfiguredValue":  false,
-                                              "policyType":  78,
+                                              "policyType":  79,
                                               "enabled":  true
                                           },
                                           {
@@ -292,7 +292,7 @@
                                                               {
                                                                   "metadata":  {
                                                                                    "dataType":  20,
-                                                                                   "category":  21,
+                                                                                   "category":  24,
                                                                                    "nameResourceKey":  "bluetoothAllowedServicesName",
                                                                                    "emptyValueResourceKey":  "guidExample",
                                                                                    "childSettings":  [
@@ -303,13 +303,13 @@
                                                                                                ],
                                                                                    "entityKey":  "guidExample",
                                                                                    "booleanActions":  0,
-                                                                                   "policyType":  78,
+                                                                                   "policyType":  79,
                                                                                    "enabled":  true
                                                                                }
                                                               }
                                                           ],
                                               "dataType":  21,
-                                              "category":  21,
+                                              "category":  24,
                                               "nameResourceKey":  "bluetoothAllowedServicesName",
                                               "descriptionResourceKey":  "bluetoothAllowedServicesDescription",
                                               "childSettings":  [
@@ -320,7 +320,7 @@
                                                           ],
                                               "entityKey":  "bluetoothAllowedServices",
                                               "booleanActions":  0,
-                                              "policyType":  78,
+                                              "policyType":  79,
                                               "enabled":  true
                                           }
                                       ]

Documentation/ObjectInfo/connectivity_windowsphonegeneral.json

@@ -1,8 +1,8 @@
-{
+{
     "connectivity_windowsphonegeneral":  [
                                              {
                                                  "dataType":  0,
-                                                 "category":  21,
+                                                 "category":  24,
                                                  "nameResourceKey":  "blockWiFiName",
                                                  "descriptionResourceKey":  "blockWiFiDescription",
                                                  "childSettings":  [
@@ -14,12 +14,12 @@
                                                  "entityKey":  "wifiBlocked",
                                                  "booleanActions":  3,
                                                  "defaultValue":  false,
-                                                 "policyType":  100,
+                                                 "policyType":  101,
                                                  "enabled":  true
                                              },
                                              {
                                                  "dataType":  0,
-                                                 "category":  21,
+                                                 "category":  24,
                                                  "nameResourceKey":  "blockWiFiTetheringName",
                                                  "descriptionResourceKey":  "empty",
                                                  "childSettings":  [
@@ -31,12 +31,12 @@
                                                  "entityKey":  "cellularBlockWifiTethering",
                                                  "booleanActions":  3,
                                                  "defaultValue":  false,
-                                                 "policyType":  100,
+                                                 "policyType":  101,
                                                  "enabled":  true
                                              },
                                              {
                                                  "dataType":  0,
-                                                 "category":  21,
+                                                 "category":  24,
                                                  "nameResourceKey":  "blockWiFiHotspotAutoConnectName",
                                                  "descriptionResourceKey":  "blockWiFiHotspotAutoConnectDescription",
                                                  "childSettings":  [
@@ -48,12 +48,12 @@
                                                  "entityKey":  "wifiBlockAutomaticConnectHotspots",
                                                  "booleanActions":  3,
                                                  "defaultValue":  false,
-                                                 "policyType":  100,
+                                                 "policyType":  101,
                                                  "enabled":  true
                                              },
                                              {
                                                  "dataType":  0,
-                                                 "category":  21,
+                                                 "category":  24,
                                                  "nameResourceKey":  "blockWiFiHotspotReportingName",
                                                  "descriptionResourceKey":  "blockWiFiHotspotReportingDescription",
                                                  "childSettings":  [
@@ -65,12 +65,12 @@
                                                  "entityKey":  "wifiBlockHotspotReporting",
                                                  "booleanActions":  3,
                                                  "defaultValue":  false,
-                                                 "policyType":  100,
+                                                 "policyType":  101,
                                                  "enabled":  true
                                              },
                                              {
                                                  "dataType":  0,
-                                                 "category":  21,
+                                                 "category":  24,
                                                  "nameResourceKey":  "blockNFCName",
                                                  "descriptionResourceKey":  "blockNFCDescription",
                                                  "childSettings":  [
@@ -82,12 +82,12 @@
                                                  "entityKey":  "nfcBlocked",
                                                  "booleanActions":  3,
                                                  "defaultValue":  false,
-                                                 "policyType":  100,
+                                                 "policyType":  101,
                                                  "enabled":  true
                                              },
                                              {
                                                  "dataType":  0,
-                                                 "category":  21,
+                                                 "category":  24,
                                                  "nameResourceKey":  "blockBluetoothName",
                                                  "descriptionResourceKey":  "blockBluetoothDescription",
                                                  "childSettings":  [
@@ -99,7 +99,7 @@
                                                  "entityKey":  "bluetoothBlocked",
                                                  "booleanActions":  3,
                                                  "defaultValue":  false,
-                                                 "policyType":  100,
+                                                 "policyType":  101,
                                                  "enabled":  true
                                              }
                                          ]

Documentation/ObjectInfo/contentcaching_macdevicefeatures.json

@@ -1,21 +1,21 @@
-{
+{
     "contentcaching_macdevicefeatures":  {
                                              "isSettingDescription":  false,
                                              "showAsSectionHeader":  true,
                                              "dataType":  8,
-                                             "category":  22,
+                                             "category":  25,
                                              "nameResourceKey":  "allEnrollmentTypesHeaderNameMac",
                                              "descriptionResourceKey":  "allEnrollmentTypesHeaderDescriptionMac",
                                              "childSettings":  [
                                                                    {
                                                                        "dataType":  0,
-                                                                       "category":  22,
+                                                                       "category":  25,
                                                                        "nameResourceKey":  "contentCachingEnabledName",
                                                                        "descriptionResourceKey":  "contentCachingEnabledDescription",
                                                                        "childSettings":  [
                                                                                              {
                                                                                                  "dataType":  16,
-                                                                                                 "category":  22,
+                                                                                                 "category":  25,
                                                                                                  "nameResourceKey":  "contentCachingTypeName",
                                                                                                  "descriptionResourceKey":  "contentCachingTypeDescription",
                                                                                                  "childSettings":  [
@@ -41,12 +41,12 @@
                                                                                                  "entityKey":  "contentCachingType",
                                                                                                  "booleanActions":  0,
                                                                                                  "defaultValue":  "notConfigured",
-                                                                                                 "policyType":  57,
+                                                                                                 "policyType":  58,
                                                                                                  "enabled":  true
                                                                                              },
                                                                                              {
-                                                                                                 "dataType":  14,
-                                                                                                 "category":  22,
+                                                                                                 "dataType":  15,
+                                                                                                 "category":  25,
                                                                                                  "nameResourceKey":  "contentCachingMaxSizeBytesName",
                                                                                                  "descriptionResourceKey":  "contentCachingMaxSizeBytesDescription",
                                                                                                  "emptyValueResourceKey":  "contentCachingMaxSizeBytesEmptyValue",
@@ -59,12 +59,12 @@
                                                                                                  "entityKey":  "contentCachingMaxSizeBytes",
                                                                                                  "booleanActions":  0,
                                                                                                  "defaultValue":  0,
-                                                                                                 "policyType":  57,
+                                                                                                 "policyType":  58,
                                                                                                  "enabled":  true
                                                                                              },
                                                                                              {
                                                                                                  "dataType":  20,
-                                                                                                 "category":  22,
+                                                                                                 "category":  25,
                                                                                                  "nameResourceKey":  "contentCachingDataPathName",
                                                                                                  "descriptionResourceKey":  "contentCachingDataPathDescription",
                                                                                                  "emptyValueResourceKey":  "contentCachingDataPathEmptyValue",
@@ -76,12 +76,12 @@
                                                                                                              ],
                                                                                                  "entityKey":  "contentCachingDataPath",
                                                                                                  "booleanActions":  0,
-                                                                                                 "policyType":  57,
+                                                                                                 "policyType":  58,
                                                                                                  "enabled":  true
                                                                                              },
                                                                                              {
                                                                                                  "dataType":  14,
-                                                                                                 "category":  22,
+                                                                                                 "category":  25,
                                                                                                  "nameResourceKey":  "contentCachingPortName",
                                                                                                  "descriptionResourceKey":  "contentCachingPortDescription",
                                                                                                  "childSettings":  [
@@ -93,18 +93,18 @@
                                                                                                  "entityKey":  "contentCachingPort",
                                                                                                  "booleanActions":  0,
                                                                                                  "defaultValue":  0,
-                                                                                                 "policyType":  57,
+                                                                                                 "policyType":  58,
                                                                                                  "enabled":  true
                                                                                              },
                                                                                              {
                                                                                                  "dataType":  0,
-                                                                                                 "category":  22,
+                                                                                                 "category":  25,
                                                                                                  "nameResourceKey":  "contentCachingDisableConnectionSharingName",
                                                                                                  "descriptionResourceKey":  "contentCachingDisableConnectionSharingDescription",
                                                                                                  "childSettings":  [
                                                                                                                        {
                                                                                                                            "dataType":  0,
-                                                                                                                           "category":  22,
+                                                                                                                           "category":  25,
                                                                                                                            "nameResourceKey":  "contentCachingForceConnectionSharingName",
                                                                                                                            "descriptionResourceKey":  "contentCachingForceConnectionSharingDescription",
                                                                                                                            "childSettings":  [
@@ -115,7 +115,7 @@
                                                                                                                                        ],
                                                                                                                            "entityKey":  "contentCachingForceConnectionSharing",
                                                                                                                            "booleanActions":  9,
-                                                                                                                           "policyType":  57,
+                                                                                                                           "policyType":  58,
                                                                                                                            "enabled":  true
                                                                                                                        }
                                                                                                                    ],
@@ -124,12 +124,12 @@
                                                                                                              ],
                                                                                                  "entityKey":  "contentCachingDisableConnectionSharing",
                                                                                                  "booleanActions":  9,
-                                                                                                 "policyType":  57,
+                                                                                                 "policyType":  58,
                                                                                                  "enabled":  true
                                                                                              },
                                                                                              {
                                                                                                  "dataType":  0,
-                                                                                                 "category":  22,
+                                                                                                 "category":  25,
                                                                                                  "nameResourceKey":  "contentCachingLogClientIdentitiesName",
                                                                                                  "descriptionResourceKey":  "contentCachingLogClientIdentitiesDescription",
                                                                                                  "childSettings":  [
@@ -140,12 +140,12 @@
                                                                                                              ],
                                                                                                  "entityKey":  "contentCachingLogClientIdentities",
                                                                                                  "booleanActions":  9,
-                                                                                                 "policyType":  57,
+                                                                                                 "policyType":  58,
                                                                                                  "enabled":  true
                                                                                              },
                                                                                              {
                                                                                                  "dataType":  0,
-                                                                                                 "category":  22,
+                                                                                                 "category":  25,
                                                                                                  "nameResourceKey":  "contentCachingBlockDeletionName",
                                                                                                  "descriptionResourceKey":  "contentCachingBlockDeletionDescription",
                                                                                                  "childSettings":  [
@@ -156,12 +156,12 @@
                                                                                                              ],
                                                                                                  "entityKey":  "contentCachingBlockDeletion",
                                                                                                  "booleanActions":  9,
-                                                                                                 "policyType":  57,
+                                                                                                 "policyType":  58,
                                                                                                  "enabled":  true
                                                                                              },
                                                                                              {
                                                                                                  "dataType":  0,
-                                                                                                 "category":  22,
+                                                                                                 "category":  25,
                                                                                                  "nameResourceKey":  "contentCachingShowAlertsName",
                                                                                                  "descriptionResourceKey":  "contentCachingShowAlertsDescription",
                                                                                                  "childSettings":  [
@@ -172,12 +172,12 @@
                                                                                                              ],
                                                                                                  "entityKey":  "contentCachingShowAlerts",
                                                                                                  "booleanActions":  9,
-                                                                                                 "policyType":  57,
+                                                                                                 "policyType":  58,
                                                                                                  "enabled":  true
                                                                                              },
                                                                                              {
                                                                                                  "dataType":  0,
-                                                                                                 "category":  22,
+                                                                                                 "category":  25,
                                                                                                  "nameResourceKey":  "contentCachingKeepAwakeName",
                                                                                                  "descriptionResourceKey":  "contentCachingKeepAwakeDescription",
                                                                                                  "childSettings":  [
@@ -188,12 +188,12 @@
                                                                                                              ],
                                                                                                  "entityKey":  "contentCachingKeepAwake",
                                                                                                  "booleanActions":  9,
-                                                                                                 "policyType":  57,
+                                                                                                 "policyType":  58,
                                                                                                  "enabled":  true
                                                                                              },
                                                                                              {
                                                                                                  "dataType":  16,
-                                                                                                 "category":  22,
+                                                                                                 "category":  25,
                                                                                                  "nameResourceKey":  "contentCachingClientPolicyName",
                                                                                                  "descriptionResourceKey":  "contentCachingClientPolicyDescription",
                                                                                                  "childSettings":  [
@@ -224,7 +224,7 @@
                                                                                                                                                           {
                                                                                                                                                               "metadata":  {
                                                                                                                                                                                "dataType":  16,
-                                                                                                                                                                               "category":  22,
+                                                                                                                                                                               "category":  25,
                                                                                                                                                                                "nameResourceKey":  "iPRangeAddressTypeName",
                                                                                                                                                                                "childSettings":  [
 
@@ -247,14 +247,14 @@
                                                                                                                                                                                            ],
                                                                                                                                                                                "entityKey":  "@odata.type",
                                                                                                                                                                                "booleanActions":  0,
-                                                                                                                                                                               "policyType":  57,
+                                                                                                                                                                               "policyType":  58,
                                                                                                                                                                                "enabled":  true
                                                                                                                                                                            }
                                                                                                                                                           },
                                                                                                                                                           {
                                                                                                                                                               "metadata":  {
                                                                                                                                                                                "dataType":  20,
-                                                                                                                                                                               "category":  22,
+                                                                                                                                                                               "category":  25,
                                                                                                                                                                                "nameResourceKey":  "iPRangeLowerAddressName",
                                                                                                                                                                                "emptyValueResourceKey":  "iPRangeLowerAddressEmptyValue",
                                                                                                                                                                                "childSettings":  [
@@ -265,14 +265,14 @@
                                                                                                                                                                                            ],
                                                                                                                                                                                "entityKey":  "lowerAddress",
                                                                                                                                                                                "booleanActions":  0,
-                                                                                                                                                                               "policyType":  57,
+                                                                                                                                                                               "policyType":  58,
                                                                                                                                                                                "enabled":  true
                                                                                                                                                                            }
                                                                                                                                                           },
                                                                                                                                                           {
                                                                                                                                                               "metadata":  {
                                                                                                                                                                                "dataType":  20,
-                                                                                                                                                                               "category":  22,
+                                                                                                                                                                               "category":  25,
                                                                                                                                                                                "nameResourceKey":  "iPRangeUpperAddressName",
                                                                                                                                                                                "emptyValueResourceKey":  "iPRangeUpperAddressEmptyValue",
                                                                                                                                                                                "childSettings":  [
@@ -283,13 +283,13 @@
                                                                                                                                                                                            ],
                                                                                                                                                                                "entityKey":  "upperAddress",
                                                                                                                                                                                "booleanActions":  0,
-                                                                                                                                                                               "policyType":  57,
+                                                                                                                                                                               "policyType":  58,
                                                                                                                                                                                "enabled":  true
                                                                                                                                                                            }
                                                                                                                                                           }
                                                                                                                                                       ],
                                                                                                                                           "dataType":  21,
-                                                                                                                                          "category":  22,
+                                                                                                                                          "category":  25,
                                                                                                                                           "nameResourceKey":  "contentCachingClientListenRangesName",
                                                                                                                                           "descriptionResourceKey":  "contentCachingClientListenRangesDescription",
                                                                                                                                           "childSettings":  [
@@ -300,7 +300,7 @@
                                                                                                                                                       ],
                                                                                                                                           "entityKey":  "contentCachingClientListenRanges",
                                                                                                                                           "booleanActions":  0,
-                                                                                                                                          "policyType":  57,
+                                                                                                                                          "policyType":  58,
                                                                                                                                           "enabled":  true
                                                                                                                                       }
                                                                                                                                   ],
@@ -315,7 +315,7 @@
                                                                                                                                                           {
                                                                                                                                                               "metadata":  {
                                                                                                                                                                                "dataType":  16,
-                                                                                                                                                                               "category":  22,
+                                                                                                                                                                               "category":  25,
                                                                                                                                                                                "nameResourceKey":  "iPRangeAddressTypeName",
                                                                                                                                                                                "childSettings":  [
 
@@ -338,14 +338,14 @@
                                                                                                                                                                                            ],
                                                                                                                                                                                "entityKey":  "@odata.type",
                                                                                                                                                                                "booleanActions":  0,
-                                                                                                                                                                               "policyType":  57,
+                                                                                                                                                                               "policyType":  58,
                                                                                                                                                                                "enabled":  true
                                                                                                                                                                            }
                                                                                                                                                           },
                                                                                                                                                           {
                                                                                                                                                               "metadata":  {
                                                                                                                                                                                "dataType":  20,
-                                                                                                                                                                               "category":  22,
+                                                                                                                                                                               "category":  25,
                                                                                                                                                                                "nameResourceKey":  "iPRangeLowerAddressName",
                                                                                                                                                                                "emptyValueResourceKey":  "iPRangeLowerAddressEmptyValue",
                                                                                                                                                                                "childSettings":  [
@@ -356,14 +356,14 @@
                                                                                                                                                                                            ],
                                                                                                                                                                                "entityKey":  "lowerAddress",
                                                                                                                                                                                "booleanActions":  0,
-                                                                                                                                                                               "policyType":  57,
+                                                                                                                                                                               "policyType":  58,
                                                                                                                                                                                "enabled":  true
                                                                                                                                                                            }
                                                                                                                                                           },
                                                                                                                                                           {
                                                                                                                                                               "metadata":  {
                                                                                                                                                                                "dataType":  20,
-                                                                                                                                                                               "category":  22,
+                                                                                                                                                                               "category":  25,
                                                                                                                                                                                "nameResourceKey":  "iPRangeUpperAddressName",
                                                                                                                                                                                "emptyValueResourceKey":  "iPRangeUpperAddressEmptyValue",
                                                                                                                                                                                "childSettings":  [
@@ -374,13 +374,13 @@
                                                                                                                                                                                            ],
                                                                                                                                                                                "entityKey":  "upperAddress",
                                                                                                                                                                                "booleanActions":  0,
-                                                                                                                                                                               "policyType":  57,
+                                                                                                                                                                               "policyType":  58,
                                                                                                                                                                                "enabled":  true
                                                                                                                                                                            }
                                                                                                                                                           }
                                                                                                                                                       ],
                                                                                                                                           "dataType":  21,
-                                                                                                                                          "category":  22,
+                                                                                                                                          "category":  25,
                                                                                                                                           "nameResourceKey":  "contentCachingClientListenRangesName",
                                                                                                                                           "descriptionResourceKey":  "contentCachingClientListenRangesDescription",
                                                                                                                                           "childSettings":  [
@@ -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
                                                                                              },
                                                                                              {
@@ -409,7 +409,7 @@
                                                                                                                  {
                                                                                                                      "metadata":  {
                                                                                                                                       "dataType":  16,
-                                                                                                                                      "category":  22,
+                                                                                                                                      "category":  25,
                                                                                                                                       "nameResourceKey":  "iPRangeAddressTypeName",
                                                                                                                                       "childSettings":  [
 
@@ -432,14 +432,14 @@
                                                                                                                                                   ],
                                                                                                                                       "entityKey":  "@odata.type",
                                                                                                                                       "booleanActions":  0,
-                                                                                                                                      "policyType":  57,
+                                                                                                                                      "policyType":  58,
                                                                                                                                       "enabled":  true
                                                                                                                                   }
                                                                                                                  },
                                                                                                                  {
                                                                                                                      "metadata":  {
                                                                                                                                       "dataType":  20,
-                                                                                                                                      "category":  22,
+                                                                                                                                      "category":  25,
                                                                                                                                       "nameResourceKey":  "iPRangeLowerAddressName",
                                                                                                                                       "emptyValueResourceKey":  "iPRangeLowerAddressEmptyValue",
                                                                                                                                       "childSettings":  [
@@ -450,14 +450,14 @@
                                                                                                                                                   ],
                                                                                                                                       "entityKey":  "lowerAddress",
                                                                                                                                       "booleanActions":  0,
-                                                                                                                                      "policyType":  57,
+                                                                                                                                      "policyType":  58,
                                                                                                                                       "enabled":  true
                                                                                                                                   }
                                                                                                                  },
                                                                                                                  {
                                                                                                                      "metadata":  {
                                                                                                                                       "dataType":  20,
-                                                                                                                                      "category":  22,
+                                                                                                                                      "category":  25,
                                                                                                                                       "nameResourceKey":  "iPRangeUpperAddressName",
                                                                                                                                       "emptyValueResourceKey":  "iPRangeUpperAddressEmptyValue",
                                                                                                                                       "childSettings":  [
@@ -468,13 +468,13 @@
                                                                                                                                                   ],
                                                                                                                                       "entityKey":  "upperAddress",
                                                                                                                                       "booleanActions":  0,
-                                                                                                                                      "policyType":  57,
+                                                                                                                                      "policyType":  58,
                                                                                                                                       "enabled":  true
                                                                                                                                   }
                                                                                                                  }
                                                                                                              ],
                                                                                                  "dataType":  21,
-                                                                                                 "category":  22,
+                                                                                                 "category":  25,
                                                                                                  "nameResourceKey":  "contentCachingPublicRangesName",
                                                                                                  "descriptionResourceKey":  "contentCachingPublicRangesDescription",
                                                                                                  "childSettings":  [
@@ -485,12 +485,12 @@
                                                                                                              ],
                                                                                                  "entityKey":  "contentCachingPublicRanges",
                                                                                                  "booleanActions":  0,
-                                                                                                 "policyType":  57,
+                                                                                                 "policyType":  58,
                                                                                                  "enabled":  true
                                                                                              },
                                                                                              {
                                                                                                  "dataType":  16,
-                                                                                                 "category":  22,
+                                                                                                 "category":  25,
                                                                                                  "nameResourceKey":  "contentCachingPeerPolicyName",
                                                                                                  "descriptionResourceKey":  "contentCachingPeerPolicyDescription",
                                                                                                  "childSettings":  [
@@ -521,7 +521,7 @@
                                                                                                                                                           {
                                                                                                                                                               "metadata":  {
                                                                                                                                                                                "dataType":  16,
-                                                                                                                                                                               "category":  22,
+                                                                                                                                                                               "category":  25,
                                                                                                                                                                                "nameResourceKey":  "iPRangeAddressTypeName",
                                                                                                                                                                                "childSettings":  [
 
@@ -544,14 +544,14 @@
                                                                                                                                                                                            ],
                                                                                                                                                                                "entityKey":  "@odata.type",
                                                                                                                                                                                "booleanActions":  0,
-                                                                                                                                                                               "policyType":  57,
+                                                                                                                                                                               "policyType":  58,
                                                                                                                                                                                "enabled":  true
                                                                                                                                                                            }
                                                                                                                                                           },
                                                                                                                                                           {
                                                                                                                                                               "metadata":  {
                                                                                                                                                                                "dataType":  20,
-                                                                                                                                                                               "category":  22,
+                                                                                                                                                                               "category":  25,
                                                                                                                                                                                "nameResourceKey":  "iPRangeLowerAddressName",
                                                                                                                                                                                "emptyValueResourceKey":  "iPRangeLowerAddressEmptyValue",
                                                                                                                                                                                "childSettings":  [
@@ -562,14 +562,14 @@
                                                                                                                                                                                            ],
                                                                                                                                                                                "entityKey":  "lowerAddress",
                                                                                                                                                                                "booleanActions":  0,
-                                                                                                                                                                               "policyType":  57,
+                                                                                                                                                                               "policyType":  58,
                                                                                                                                                                                "enabled":  true
                                                                                                                                                                            }
                                                                                                                                                           },
                                                                                                                                                           {
                                                                                                                                                               "metadata":  {
                                                                                                                                                                                "dataType":  20,
-                                                                                                                                                                               "category":  22,
+                                                                                                                                                                               "category":  25,
                                                                                                                                                                                "nameResourceKey":  "iPRangeUpperAddressName",
                                                                                                                                                                                "emptyValueResourceKey":  "iPRangeUpperAddressEmptyValue",
                                                                                                                                                                                "childSettings":  [
@@ -580,13 +580,13 @@
                                                                                                                                                                                            ],
                                                                                                                                                                                "entityKey":  "upperAddress",
                                                                                                                                                                                "booleanActions":  0,
-                                                                                                                                                                               "policyType":  57,
+                                                                                                                                                                               "policyType":  58,
                                                                                                                                                                                "enabled":  true
                                                                                                                                                                            }
                                                                                                                                                           }
                                                                                                                                                       ],
                                                                                                                                           "dataType":  21,
-                                                                                                                                          "category":  22,
+                                                                                                                                          "category":  25,
                                                                                                                                           "nameResourceKey":  "contentCachingPeerListenRangesName",
                                                                                                                                           "descriptionResourceKey":  "contentCachingPeerListenRangesDescription",
                                                                                                                                           "childSettings":  [
@@ -597,7 +597,7 @@
                                                                                                                                                       ],
                                                                                                                                           "entityKey":  "contentCachingPeerListenRanges",
                                                                                                                                           "booleanActions":  0,
-                                                                                                                                          "policyType":  57,
+                                                                                                                                          "policyType":  58,
                                                                                                                                           "enabled":  true
                                                                                                                                       },
                                                                                                                                       {
@@ -605,7 +605,7 @@
                                                                                                                                                           {
                                                                                                                                                               "metadata":  {
                                                                                                                                                                                "dataType":  16,
-                                                                                                                                                                               "category":  22,
+                                                                                                                                                                               "category":  25,
                                                                                                                                                                                "nameResourceKey":  "iPRangeAddressTypeName",
                                                                                                                                                                                "childSettings":  [
 
@@ -628,14 +628,14 @@
                                                                                                                                                                                            ],
                                                                                                                                                                                "entityKey":  "@odata.type",
                                                                                                                                                                                "booleanActions":  0,
-                                                                                                                                                                               "policyType":  57,
+                                                                                                                                                                               "policyType":  58,
                                                                                                                                                                                "enabled":  true
                                                                                                                                                                            }
                                                                                                                                                           },
                                                                                                                                                           {
                                                                                                                                                               "metadata":  {
                                                                                                                                                                                "dataType":  20,
-                                                                                                                                                                               "category":  22,
+                                                                                                                                                                               "category":  25,
                                                                                                                                                                                "nameResourceKey":  "iPRangeLowerAddressName",
                                                                                                                                                                                "emptyValueResourceKey":  "iPRangeLowerAddressEmptyValue",
                                                                                                                                                                                "childSettings":  [
@@ -646,14 +646,14 @@
                                                                                                                                                                                            ],
                                                                                                                                                                                "entityKey":  "lowerAddress",
                                                                                                                                                                                "booleanActions":  0,
-                                                                                                                                                                               "policyType":  57,
+                                                                                                                                                                               "policyType":  58,
                                                                                                                                                                                "enabled":  true
                                                                                                                                                                            }
                                                                                                                                                           },
                                                                                                                                                           {
                                                                                                                                                               "metadata":  {
                                                                                                                                                                                "dataType":  20,
-                                                                                                                                                                               "category":  22,
+                                                                                                                                                                               "category":  25,
                                                                                                                                                                                "nameResourceKey":  "iPRangeUpperAddressName",
                                                                                                                                                                                "emptyValueResourceKey":  "iPRangeUpperAddressEmptyValue",
                                                                                                                                                                                "childSettings":  [
@@ -664,13 +664,13 @@
                                                                                                                                                                                            ],
                                                                                                                                                                                "entityKey":  "upperAddress",
                                                                                                                                                                                "booleanActions":  0,
-                                                                                                                                                                               "policyType":  57,
+                                                                                                                                                                               "policyType":  58,
                                                                                                                                                                                "enabled":  true
                                                                                                                                                                            }
                                                                                                                                                           }
                                                                                                                                                       ],
                                                                                                                                           "dataType":  21,
-                                                                                                                                          "category":  22,
+                                                                                                                                          "category":  25,
                                                                                                                                           "nameResourceKey":  "contentCachingPeerFilterRangesName",
                                                                                                                                           "descriptionResourceKey":  "contentCachingPeerFilterRangesDescription",
                                                                                                                                           "childSettings":  [
@@ -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
                                                                                              },
                                                                                              {
@@ -699,7 +699,7 @@
                                                                                                                  {
                                                                                                                      "metadata":  {
                                                                                                                                       "dataType":  20,
-                                                                                                                                      "category":  22,
+                                                                                                                                      "category":  25,
                                                                                                                                       "nameResourceKey":  "contentCachingParentsName",
                                                                                                                                       "childSettings":  [
 
@@ -709,13 +709,13 @@
                                                                                                                                                   ],
                                                                                                                                       "entityKey":  "contentCachingParents",
                                                                                                                                       "booleanActions":  0,
-                                                                                                                                      "policyType":  57,
+                                                                                                                                      "policyType":  58,
                                                                                                                                       "enabled":  true
                                                                                                                                   }
                                                                                                                  }
                                                                                                              ],
                                                                                                  "dataType":  21,
-                                                                                                 "category":  22,
+                                                                                                 "category":  25,
                                                                                                  "nameResourceKey":  "contentCachingParentsName",
                                                                                                  "descriptionResourceKey":  "contentCachingParentsDescription",
                                                                                                  "childSettings":  [
@@ -726,12 +726,12 @@
                                                                                                              ],
                                                                                                  "entityKey":  "contentCachingParents",
                                                                                                  "booleanActions":  0,
-                                                                                                 "policyType":  57,
+                                                                                                 "policyType":  58,
                                                                                                  "enabled":  true
                                                                                              },
                                                                                              {
                                                                                                  "dataType":  16,
-                                                                                                 "category":  22,
+                                                                                                 "category":  25,
                                                                                                  "nameResourceKey":  "contentCachingParentSelectionPolicyName",
                                                                                                  "descriptionResourceKey":  "contentCachingParentSelectionPolicyDescription",
                                                                                                  "childSettings":  [
@@ -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

@@ -1,19 +1,19 @@
-{
+{
     "controlpanelandsettings_windows10general":  {
                                                      "dataType":  0,
-                                                     "category":  23,
+                                                     "category":  26,
                                                      "nameResourceKey":  "settingsAppName",
                                                      "descriptionResourceKey":  "settingsAppDescription",
                                                      "childSettings":  [
                                                                            {
                                                                                "dataType":  0,
-                                                                               "category":  23,
+                                                                               "category":  26,
                                                                                "nameResourceKey":  "systemPageName",
                                                                                "descriptionResourceKey":  "systemPageDescription",
                                                                                "childSettings":  [
                                                                                                      {
                                                                                                          "dataType":  0,
-                                                                                                         "category":  23,
+                                                                                                         "category":  26,
                                                                                                          "nameResourceKey":  "settingsBlockChangePowerSleepName",
                                                                                                          "descriptionResourceKey":  "settingsBlockChangePowerSleepDesc",
                                                                                                          "childSettings":  [
@@ -25,7 +25,7 @@
                                                                                                          "entityKey":  "settingsBlockChangePowerSleep",
                                                                                                          "booleanActions":  3,
                                                                                                          "defaultValue":  false,
-                                                                                                         "policyType":  78,
+                                                                                                         "policyType":  79,
                                                                                                          "enabled":  true
                                                                                                      }
                                                                                                  ],
@@ -35,12 +35,12 @@
                                                                                "entityKey":  "settingsBlockSystemPage",
                                                                                "booleanActions":  3,
                                                                                "defaultValue":  false,
-                                                                               "policyType":  78,
+                                                                               "policyType":  79,
                                                                                "enabled":  true
                                                                            },
                                                                            {
                                                                                "dataType":  0,
-                                                                               "category":  23,
+                                                                               "category":  26,
                                                                                "nameResourceKey":  "devicesPageName",
                                                                                "descriptionResourceKey":  "devicesPageDescription",
                                                                                "childSettings":  [
@@ -52,12 +52,12 @@
                                                                                "entityKey":  "settingsBlockDevicesPage",
                                                                                "booleanActions":  3,
                                                                                "defaultValue":  false,
-                                                                               "policyType":  78,
+                                                                               "policyType":  79,
                                                                                "enabled":  true
                                                                            },
                                                                            {
                                                                                "dataType":  0,
-                                                                               "category":  23,
+                                                                               "category":  26,
                                                                                "nameResourceKey":  "networkAndInternetPageName",
                                                                                "descriptionResourceKey":  "networkAndInternetPageDescription",
                                                                                "childSettings":  [
@@ -69,12 +69,12 @@
                                                                                "entityKey":  "settingsBlockNetworkInternetPage",
                                                                                "booleanActions":  3,
                                                                                "defaultValue":  false,
-                                                                               "policyType":  78,
+                                                                               "policyType":  79,
                                                                                "enabled":  true
                                                                            },
                                                                            {
                                                                                "dataType":  0,
-                                                                               "category":  23,
+                                                                               "category":  26,
                                                                                "nameResourceKey":  "personalizationPageName",
                                                                                "descriptionResourceKey":  "personalizationPageDescription",
                                                                                "childSettings":  [
@@ -86,12 +86,12 @@
                                                                                "entityKey":  "settingsBlockPersonalizationPage",
                                                                                "booleanActions":  3,
                                                                                "defaultValue":  false,
-                                                                               "policyType":  78,
+                                                                               "policyType":  79,
                                                                                "enabled":  true
                                                                            },
                                                                            {
                                                                                "dataType":  0,
-                                                                               "category":  23,
+                                                                               "category":  26,
                                                                                "nameResourceKey":  "appsPageName",
                                                                                "descriptionResourceKey":  "appsPageDescription",
                                                                                "childSettings":  [
@@ -103,12 +103,12 @@
                                                                                "entityKey":  "settingsBlockAppsPage",
                                                                                "booleanActions":  3,
                                                                                "defaultValue":  false,
-                                                                               "policyType":  78,
+                                                                               "policyType":  79,
                                                                                "enabled":  true
                                                                            },
                                                                            {
                                                                                "dataType":  0,
-                                                                               "category":  23,
+                                                                               "category":  26,
                                                                                "nameResourceKey":  "accountsPageName",
                                                                                "descriptionResourceKey":  "accountsPageDescription",
                                                                                "childSettings":  [
@@ -120,18 +120,18 @@
                                                                                "entityKey":  "settingsBlockAccountsPage",
                                                                                "booleanActions":  3,
                                                                                "defaultValue":  false,
-                                                                               "policyType":  78,
+                                                                               "policyType":  79,
                                                                                "enabled":  true
                                                                            },
                                                                            {
                                                                                "dataType":  0,
-                                                                               "category":  23,
+                                                                               "category":  26,
                                                                                "nameResourceKey":  "timeAndLanguagePageName",
                                                                                "descriptionResourceKey":  "timeAndLanguagePageDescription",
                                                                                "childSettings":  [
                                                                                                      {
                                                                                                          "dataType":  0,
-                                                                                                         "category":  23,
+                                                                                                         "category":  26,
                                                                                                          "nameResourceKey":  "settingsBlockChangeSystemTimeName",
                                                                                                          "descriptionResourceKey":  "settingsBlockChangeSystemTimeDesc",
                                                                                                          "childSettings":  [
@@ -143,12 +143,12 @@
                                                                                                          "entityKey":  "settingsBlockChangeSystemTime",
                                                                                                          "booleanActions":  3,
                                                                                                          "defaultValue":  false,
-                                                                                                         "policyType":  78,
+                                                                                                         "policyType":  79,
                                                                                                          "enabled":  true
                                                                                                      },
                                                                                                      {
                                                                                                          "dataType":  0,
-                                                                                                         "category":  23,
+                                                                                                         "category":  26,
                                                                                                          "nameResourceKey":  "settingsBlockChangeRegionName",
                                                                                                          "descriptionResourceKey":  "settingsBlockChangeRegionDesc",
                                                                                                          "childSettings":  [
@@ -160,12 +160,12 @@
                                                                                                          "entityKey":  "settingsBlockChangeRegion",
                                                                                                          "booleanActions":  3,
                                                                                                          "defaultValue":  false,
-                                                                                                         "policyType":  78,
+                                                                                                         "policyType":  79,
                                                                                                          "enabled":  true
                                                                                                      },
                                                                                                      {
                                                                                                          "dataType":  0,
-                                                                                                         "category":  23,
+                                                                                                         "category":  26,
                                                                                                          "nameResourceKey":  "settingsBlockChangeLanguageName",
                                                                                                          "descriptionResourceKey":  "settingsBlockChangeLanguageDesc",
                                                                                                          "childSettings":  [
@@ -177,7 +177,7 @@
                                                                                                          "entityKey":  "settingsBlockChangeLanguage",
                                                                                                          "booleanActions":  3,
                                                                                                          "defaultValue":  false,
-                                                                                                         "policyType":  78,
+                                                                                                         "policyType":  79,
                                                                                                          "enabled":  true
                                                                                                      }
                                                                                                  ],
@@ -187,12 +187,12 @@
                                                                                "entityKey":  "settingsBlockTimeLanguagePage",
                                                                                "booleanActions":  3,
                                                                                "defaultValue":  false,
-                                                                               "policyType":  78,
+                                                                               "policyType":  79,
                                                                                "enabled":  true
                                                                            },
                                                                            {
                                                                                "dataType":  0,
-                                                                               "category":  23,
+                                                                               "category":  26,
                                                                                "nameResourceKey":  "gamingPageName",
                                                                                "descriptionResourceKey":  "gamingPageDescription",
                                                                                "childSettings":  [
@@ -204,12 +204,12 @@
                                                                                "entityKey":  "settingsBlockGamingPage",
                                                                                "booleanActions":  3,
                                                                                "defaultValue":  false,
-                                                                               "policyType":  78,
+                                                                               "policyType":  79,
                                                                                "enabled":  true
                                                                            },
                                                                            {
                                                                                "dataType":  0,
-                                                                               "category":  23,
+                                                                               "category":  26,
                                                                                "nameResourceKey":  "easeOfAccessPageName",
                                                                                "descriptionResourceKey":  "easeOfAccessPageDescription",
                                                                                "childSettings":  [
@@ -221,12 +221,12 @@
                                                                                "entityKey":  "settingsBlockEaseOfAccessPage",
                                                                                "booleanActions":  3,
                                                                                "defaultValue":  false,
-                                                                               "policyType":  78,
+                                                                               "policyType":  79,
                                                                                "enabled":  true
                                                                            },
                                                                            {
                                                                                "dataType":  0,
-                                                                               "category":  23,
+                                                                               "category":  26,
                                                                                "nameResourceKey":  "privacyPageName",
                                                                                "descriptionResourceKey":  "privacyPageDescription",
                                                                                "childSettings":  [
@@ -238,12 +238,12 @@
                                                                                "entityKey":  "settingsBlockPrivacyPage",
                                                                                "booleanActions":  3,
                                                                                "defaultValue":  false,
-                                                                               "policyType":  78,
+                                                                               "policyType":  79,
                                                                                "enabled":  true
                                                                            },
                                                                            {
                                                                                "dataType":  0,
-                                                                               "category":  23,
+                                                                               "category":  26,
                                                                                "nameResourceKey":  "updateAndSecurityPageName",
                                                                                "descriptionResourceKey":  "updateAndSecurityPageDescription",
                                                                                "childSettings":  [
@@ -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

@@ -1,7 +1,7 @@
-{
+{
     "credentialguard_windows10endpointprotection":  {
                                                         "dataType":  16,
-                                                        "category":  24,
+                                                        "category":  27,
                                                         "nameResourceKey":  "deviceGuardCredentialGuardName",
                                                         "descriptionResourceKey":  "deviceGuardCredentialGuardDescription",
                                                         "childSettings":  [
@@ -33,7 +33,7 @@
                                                         "booleanActions":  0,
                                                         "defaultValue":  "notConfigured",
                                                         "unconfiguredValue":  "notConfigured",
-                                                        "policyType":  76,
+                                                        "policyType":  77,
                                                         "enabled":  true
                                                     }
 }

Documentation/ObjectInfo/customcompliance_compliancewindows10.json

@@ -1,15 +1,32 @@
-{
+{
     "customcompliance_compliancewindows10":  {
+                                                 "dataType":  0,
+                                                 "category":  151,
+                                                 "nameResourceKey":  "AdminConfiguredComplianceSettingName",
+                                                 "descriptionResourceKey":  "CustomComplianceToolTip",
+                                                 "childSettings":  [
+                                                                       {
                                                                            "dataType":  25,
-                                                 "category":  142,
+                                                                           "category":  151,
                                                                            "childSettings":  [
 
                                                                                              ],
                                                                            "options":  [
 
                                                                                        ],
+                                                                           "entityKey":  "customCompliance",
                                                                            "booleanActions":  0,
                                                                            "policyType":  35,
                                                                            "enabled":  true
                                                                        }
+                                                                   ],
+                                                 "options":  [
+
+                                                             ],
+                                                 "entityKey":  "customComplianceRequired",
+                                                 "booleanActions":  1,
+                                                 "defaultValue":  false,
+                                                 "policyType":  35,
+                                                 "enabled":  true
+                                             }
 }

Documentation/ObjectInfo/customconfiguration_ioscustom.json

@@ -1,8 +1,8 @@
-{
+{
     "customconfiguration_ioscustom":  [
                                           {
                                               "dataType":  20,
-                                              "category":  25,
+                                              "category":  28,
                                               "nameResourceKey":  "customPolicyConfigurationProfileName",
                                               "descriptionResourceKey":  "customPolicyConfigurationProfileDescription",
                                               "childSettings":  [
@@ -14,14 +14,14 @@
                                               "entityKey":  "payloadName",
                                               "booleanActions":  0,
                                               "defaultValue":  "",
-                                              "policyType":  40,
+                                              "policyType":  41,
                                               "enabled":  true
                                           },
                                           {
                                               "dataEntityKey":  "payload",
                                               "filenameEntityKey":  "payloadFileName",
                                               "dataType":  2,
-                                              "category":  25,
+                                              "category":  28,
                                               "nameResourceKey":  "customPolicyConfigurationProfileFileName",
                                               "descriptionResourceKey":  "empty",
                                               "childSettings":  [
@@ -32,7 +32,7 @@
                                                           ],
                                               "entityKey":  "payload",
                                               "booleanActions":  0,
-                                              "policyType":  40,
+                                              "policyType":  41,
                                               "enabled":  true
                                           }
                                       ]

Documentation/ObjectInfo/customconfiguration_maccustom.json

@@ -1,8 +1,8 @@
-{
+{
     "customconfiguration_maccustom":  [
                                           {
                                               "dataType":  20,
-                                              "category":  25,
+                                              "category":  28,
                                               "nameResourceKey":  "customPolicyConfigurationProfileName",
                                               "descriptionResourceKey":  "customPolicyConfigurationProfileDescription",
                                               "childSettings":  [
@@ -14,14 +14,41 @@
                                               "entityKey":  "payloadName",
                                               "booleanActions":  0,
                                               "defaultValue":  "",
-                                              "policyType":  55,
+                                              "policyType":  56,
+                                              "enabled":  true
+                                          },
+                                          {
+                                              "dataType":  16,
+                                              "category":  28,
+                                              "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
                                           },
                                           {
                                               "dataEntityKey":  "payload",
                                               "filenameEntityKey":  "payloadFileName",
                                               "dataType":  2,
-                                              "category":  25,
+                                              "category":  28,
                                               "nameResourceKey":  "customPolicyConfigurationProfileFileName",
                                               "descriptionResourceKey":  "empty",
                                               "childSettings":  [
@@ -32,7 +59,7 @@
                                                           ],
                                               "entityKey":  "payload",
                                               "booleanActions":  0,
-                                              "policyType":  55,
+                                              "policyType":  56,
                                               "enabled":  true
                                           }
                                       ]

Documentation/ObjectInfo/customomasettings_androidcustom.json

@@ -1,10 +1,10 @@
-{
+{
     "customomasettings_androidcustom":  {
                                             "columns":  [
                                                             {
                                                                 "metadata":  {
                                                                                  "dataType":  20,
-                                                                                 "category":  26,
+                                                                                 "category":  29,
                                                                                  "nameResourceKey":  "nameName",
                                                                                  "descriptionResourceKey":  "empty",
                                                                                  "childSettings":  [
@@ -22,7 +22,7 @@
                                                             {
                                                                 "metadata":  {
                                                                                  "dataType":  20,
-                                                                                 "category":  26,
+                                                                                 "category":  29,
                                                                                  "nameResourceKey":  "descriptionName",
                                                                                  "descriptionResourceKey":  "empty",
                                                                                  "childSettings":  [
@@ -40,7 +40,7 @@
                                                             {
                                                                 "metadata":  {
                                                                                  "dataType":  20,
-                                                                                 "category":  26,
+                                                                                 "category":  29,
                                                                                  "nameResourceKey":  "oMAURIName",
                                                                                  "descriptionResourceKey":  "empty",
                                                                                  "childSettings":  [
@@ -58,7 +58,7 @@
                                                             {
                                                                 "metadata":  {
                                                                                  "dataType":  16,
-                                                                                 "category":  26,
+                                                                                 "category":  29,
                                                                                  "nameResourceKey":  "dataTypeName",
                                                                                  "descriptionResourceKey":  "empty",
                                                                                  "childSettings":  [
@@ -75,7 +75,7 @@
                                                                                                      "children":  [
                                                                                                                       {
                                                                                                                           "dataType":  12,
-                                                                                                                          "category":  26,
+                                                                                                                          "category":  29,
                                                                                                                           "nameResourceKey":  "valueName",
                                                                                                                           "descriptionResourceKey":  "empty",
                                                                                                                           "childSettings":  [
@@ -100,7 +100,7 @@
                                                                                                                           "dataEntityKey":  "value",
                                                                                                                           "filenameEntityKey":  "fileName",
                                                                                                                           "dataType":  2,
-                                                                                                                          "category":  26,
+                                                                                                                          "category":  29,
                                                                                                                           "nameResourceKey":  "vPNPolicyCustomXMLName",
                                                                                                                           "descriptionResourceKey":  "empty",
                                                                                                                           "childSettings":  [
@@ -123,7 +123,7 @@
                                                                                                      "children":  [
                                                                                                                       {
                                                                                                                           "dataType":  7,
-                                                                                                                          "category":  26,
+                                                                                                                          "category":  29,
                                                                                                                           "nameResourceKey":  "valueName",
                                                                                                                           "descriptionResourceKey":  "empty",
                                                                                                                           "childSettings":  [
@@ -146,7 +146,7 @@
                                                                                                      "children":  [
                                                                                                                       {
                                                                                                                           "dataType":  14,
-                                                                                                                          "category":  26,
+                                                                                                                          "category":  29,
                                                                                                                           "nameResourceKey":  "valueName",
                                                                                                                           "descriptionResourceKey":  "empty",
                                                                                                                           "childSettings":  [
@@ -169,7 +169,7 @@
                                                                                                      "children":  [
                                                                                                                       {
                                                                                                                           "dataType":  20,
-                                                                                                                          "category":  26,
+                                                                                                                          "category":  29,
                                                                                                                           "nameResourceKey":  "valueName",
                                                                                                                           "descriptionResourceKey":  "empty",
                                                                                                                           "childSettings":  [
@@ -192,7 +192,7 @@
                                                                                                      "children":  [
                                                                                                                       {
                                                                                                                           "dataType":  16,
-                                                                                                                          "category":  26,
+                                                                                                                          "category":  29,
                                                                                                                           "nameResourceKey":  "valueName",
                                                                                                                           "descriptionResourceKey":  "empty",
                                                                                                                           "childSettings":  [
@@ -227,7 +227,7 @@
                                                                                                                           "dataEntityKey":  "value",
                                                                                                                           "filenameEntityKey":  "fileName",
                                                                                                                           "dataType":  2,
-                                                                                                                          "category":  26,
+                                                                                                                          "category":  29,
                                                                                                                           "nameResourceKey":  "omaBase64Name",
                                                                                                                           "descriptionResourceKey":  "empty",
                                                                                                                           "childSettings":  [
@@ -253,7 +253,7 @@
                                                             }
                                                         ],
                                             "dataType":  21,
-                                            "category":  26,
+                                            "category":  29,
                                             "nameResourceKey":  "customPolicyOMAURISettingsName",
                                             "descriptionResourceKey":  "empty",
                                             "childSettings":  [

Documentation/ObjectInfo/customomasettings_androidforworkcustom.json

@@ -1,10 +1,10 @@
-{
+{
     "customomasettings_androidforworkcustom":  {
                                                    "columns":  [
                                                                    {
                                                                        "metadata":  {
                                                                                         "dataType":  20,
-                                                                                        "category":  26,
+                                                                                        "category":  29,
                                                                                         "nameResourceKey":  "nameName",
                                                                                         "descriptionResourceKey":  "empty",
                                                                                         "childSettings":  [
@@ -22,7 +22,7 @@
                                                                    {
                                                                        "metadata":  {
                                                                                         "dataType":  20,
-                                                                                        "category":  26,
+                                                                                        "category":  29,
                                                                                         "nameResourceKey":  "descriptionName",
                                                                                         "descriptionResourceKey":  "empty",
                                                                                         "childSettings":  [
@@ -40,7 +40,7 @@
                                                                    {
                                                                        "metadata":  {
                                                                                         "dataType":  20,
-                                                                                        "category":  26,
+                                                                                        "category":  29,
                                                                                         "nameResourceKey":  "oMAURIName",
                                                                                         "descriptionResourceKey":  "empty",
                                                                                         "childSettings":  [
@@ -58,7 +58,7 @@
                                                                    {
                                                                        "metadata":  {
                                                                                         "dataType":  16,
-                                                                                        "category":  26,
+                                                                                        "category":  29,
                                                                                         "nameResourceKey":  "dataTypeName",
                                                                                         "descriptionResourceKey":  "empty",
                                                                                         "childSettings":  [
@@ -75,7 +75,7 @@
                                                                                                             "children":  [
                                                                                                                              {
                                                                                                                                  "dataType":  12,
-                                                                                                                                 "category":  26,
+                                                                                                                                 "category":  29,
                                                                                                                                  "nameResourceKey":  "valueName",
                                                                                                                                  "descriptionResourceKey":  "empty",
                                                                                                                                  "childSettings":  [
@@ -100,7 +100,7 @@
                                                                                                                                  "dataEntityKey":  "value",
                                                                                                                                  "filenameEntityKey":  "fileName",
                                                                                                                                  "dataType":  2,
-                                                                                                                                 "category":  26,
+                                                                                                                                 "category":  29,
                                                                                                                                  "nameResourceKey":  "vPNPolicyCustomXMLName",
                                                                                                                                  "descriptionResourceKey":  "empty",
                                                                                                                                  "childSettings":  [
@@ -123,7 +123,7 @@
                                                                                                             "children":  [
                                                                                                                              {
                                                                                                                                  "dataType":  7,
-                                                                                                                                 "category":  26,
+                                                                                                                                 "category":  29,
                                                                                                                                  "nameResourceKey":  "valueName",
                                                                                                                                  "descriptionResourceKey":  "empty",
                                                                                                                                  "childSettings":  [
@@ -146,7 +146,7 @@
                                                                                                             "children":  [
                                                                                                                              {
                                                                                                                                  "dataType":  14,
-                                                                                                                                 "category":  26,
+                                                                                                                                 "category":  29,
                                                                                                                                  "nameResourceKey":  "valueName",
                                                                                                                                  "descriptionResourceKey":  "empty",
                                                                                                                                  "childSettings":  [
@@ -169,7 +169,7 @@
                                                                                                             "children":  [
                                                                                                                              {
                                                                                                                                  "dataType":  20,
-                                                                                                                                 "category":  26,
+                                                                                                                                 "category":  29,
                                                                                                                                  "nameResourceKey":  "valueName",
                                                                                                                                  "descriptionResourceKey":  "empty",
                                                                                                                                  "childSettings":  [
@@ -192,7 +192,7 @@
                                                                                                             "children":  [
                                                                                                                              {
                                                                                                                                  "dataType":  16,
-                                                                                                                                 "category":  26,
+                                                                                                                                 "category":  29,
                                                                                                                                  "nameResourceKey":  "valueName",
                                                                                                                                  "descriptionResourceKey":  "empty",
                                                                                                                                  "childSettings":  [
@@ -227,7 +227,7 @@
                                                                                                                                  "dataEntityKey":  "value",
                                                                                                                                  "filenameEntityKey":  "fileName",
                                                                                                                                  "dataType":  2,
-                                                                                                                                 "category":  26,
+                                                                                                                                 "category":  29,
                                                                                                                                  "nameResourceKey":  "omaBase64Name",
                                                                                                                                  "descriptionResourceKey":  "empty",
                                                                                                                                  "childSettings":  [
@@ -253,7 +253,7 @@
                                                                    }
                                                                ],
                                                    "dataType":  21,
-                                                   "category":  26,
+                                                   "category":  29,
                                                    "nameResourceKey":  "customPolicyOMAURISettingsName",
                                                    "descriptionResourceKey":  "empty",
                                                    "childSettings":  [

Documentation/ObjectInfo/customomasettings_windows10custom.json

@@ -1,10 +1,10 @@
-{
+{
     "customomasettings_windows10custom":  {
                                               "columns":  [
                                                               {
                                                                   "metadata":  {
                                                                                    "dataType":  20,
-                                                                                   "category":  26,
+                                                                                   "category":  29,
                                                                                    "nameResourceKey":  "nameName",
                                                                                    "descriptionResourceKey":  "empty",
                                                                                    "childSettings":  [
@@ -15,14 +15,14 @@
                                                                                                ],
                                                                                    "entityKey":  "displayName",
                                                                                    "booleanActions":  0,
-                                                                                   "policyType":  73,
+                                                                                   "policyType":  74,
                                                                                    "enabled":  true
                                                                                }
                                                               },
                                                               {
                                                                   "metadata":  {
                                                                                    "dataType":  20,
-                                                                                   "category":  26,
+                                                                                   "category":  29,
                                                                                    "nameResourceKey":  "descriptionName",
                                                                                    "descriptionResourceKey":  "empty",
                                                                                    "childSettings":  [
@@ -33,14 +33,14 @@
                                                                                                ],
                                                                                    "entityKey":  "description",
                                                                                    "booleanActions":  0,
-                                                                                   "policyType":  73,
+                                                                                   "policyType":  74,
                                                                                    "enabled":  true
                                                                                }
                                                               },
                                                               {
                                                                   "metadata":  {
                                                                                    "dataType":  20,
-                                                                                   "category":  26,
+                                                                                   "category":  29,
                                                                                    "nameResourceKey":  "oMAURIName",
                                                                                    "descriptionResourceKey":  "empty",
                                                                                    "childSettings":  [
@@ -51,14 +51,14 @@
                                                                                                ],
                                                                                    "entityKey":  "omaUri",
                                                                                    "booleanActions":  0,
-                                                                                   "policyType":  73,
+                                                                                   "policyType":  74,
                                                                                    "enabled":  true
                                                                                }
                                                               },
                                                               {
                                                                   "metadata":  {
                                                                                    "dataType":  16,
-                                                                                   "category":  26,
+                                                                                   "category":  29,
                                                                                    "nameResourceKey":  "dataTypeName",
                                                                                    "descriptionResourceKey":  "empty",
                                                                                    "childSettings":  [
@@ -75,7 +75,7 @@
                                                                                                        "children":  [
                                                                                                                         {
                                                                                                                             "dataType":  12,
-                                                                                                                            "category":  26,
+                                                                                                                            "category":  29,
                                                                                                                             "nameResourceKey":  "valueName",
                                                                                                                             "descriptionResourceKey":  "empty",
                                                                                                                             "childSettings":  [
@@ -86,7 +86,7 @@
                                                                                                                                         ],
                                                                                                                             "entityKey":  "value",
                                                                                                                             "booleanActions":  0,
-                                                                                                                            "policyType":  73,
+                                                                                                                            "policyType":  74,
                                                                                                                             "enabled":  true
                                                                                                                         }
                                                                                                                     ],
@@ -100,7 +100,7 @@
                                                                                                                             "dataEntityKey":  "value",
                                                                                                                             "filenameEntityKey":  "fileName",
                                                                                                                             "dataType":  2,
-                                                                                                                            "category":  26,
+                                                                                                                            "category":  29,
                                                                                                                             "nameResourceKey":  "vPNPolicyCustomXMLName",
                                                                                                                             "descriptionResourceKey":  "empty",
                                                                                                                             "childSettings":  [
@@ -111,7 +111,7 @@
                                                                                                                                         ],
                                                                                                                             "entityKey":  "value",
                                                                                                                             "booleanActions":  0,
-                                                                                                                            "policyType":  73,
+                                                                                                                            "policyType":  74,
                                                                                                                             "enabled":  true
                                                                                                                         }
                                                                                                                     ],
@@ -123,7 +123,7 @@
                                                                                                        "children":  [
                                                                                                                         {
                                                                                                                             "dataType":  7,
-                                                                                                                            "category":  26,
+                                                                                                                            "category":  29,
                                                                                                                             "nameResourceKey":  "valueName",
                                                                                                                             "descriptionResourceKey":  "empty",
                                                                                                                             "childSettings":  [
@@ -134,7 +134,7 @@
                                                                                                                                         ],
                                                                                                                             "entityKey":  "value",
                                                                                                                             "booleanActions":  0,
-                                                                                                                            "policyType":  73,
+                                                                                                                            "policyType":  74,
                                                                                                                             "enabled":  true
                                                                                                                         }
                                                                                                                     ],
@@ -146,7 +146,7 @@
                                                                                                        "children":  [
                                                                                                                         {
                                                                                                                             "dataType":  14,
-                                                                                                                            "category":  26,
+                                                                                                                            "category":  29,
                                                                                                                             "nameResourceKey":  "valueName",
                                                                                                                             "descriptionResourceKey":  "empty",
                                                                                                                             "childSettings":  [
@@ -157,7 +157,7 @@
                                                                                                                                         ],
                                                                                                                             "entityKey":  "value",
                                                                                                                             "booleanActions":  0,
-                                                                                                                            "policyType":  73,
+                                                                                                                            "policyType":  74,
                                                                                                                             "enabled":  true
                                                                                                                         }
                                                                                                                     ],
@@ -169,7 +169,7 @@
                                                                                                        "children":  [
                                                                                                                         {
                                                                                                                             "dataType":  20,
-                                                                                                                            "category":  26,
+                                                                                                                            "category":  29,
                                                                                                                             "nameResourceKey":  "valueName",
                                                                                                                             "descriptionResourceKey":  "empty",
                                                                                                                             "childSettings":  [
@@ -180,7 +180,7 @@
                                                                                                                                         ],
                                                                                                                             "entityKey":  "value",
                                                                                                                             "booleanActions":  0,
-                                                                                                                            "policyType":  73,
+                                                                                                                            "policyType":  74,
                                                                                                                             "enabled":  true
                                                                                                                         }
                                                                                                                     ],
@@ -192,7 +192,7 @@
                                                                                                        "children":  [
                                                                                                                         {
                                                                                                                             "dataType":  16,
-                                                                                                                            "category":  26,
+                                                                                                                            "category":  29,
                                                                                                                             "nameResourceKey":  "valueName",
                                                                                                                             "descriptionResourceKey":  "empty",
                                                                                                                             "childSettings":  [
@@ -213,7 +213,7 @@
                                                                                                                             "entityKey":  "value",
                                                                                                                             "booleanActions":  0,
                                                                                                                             "defaultValue":  false,
-                                                                                                                            "policyType":  73,
+                                                                                                                            "policyType":  74,
                                                                                                                             "enabled":  true
                                                                                                                         }
                                                                                                                     ],
@@ -227,7 +227,7 @@
                                                                                                                             "dataEntityKey":  "value",
                                                                                                                             "filenameEntityKey":  "fileName",
                                                                                                                             "dataType":  2,
-                                                                                                                            "category":  26,
+                                                                                                                            "category":  29,
                                                                                                                             "nameResourceKey":  "omaBase64Name",
                                                                                                                             "descriptionResourceKey":  "empty",
                                                                                                                             "childSettings":  [
@@ -238,7 +238,7 @@
                                                                                                                                         ],
                                                                                                                             "entityKey":  "value",
                                                                                                                             "booleanActions":  0,
-                                                                                                                            "policyType":  73,
+                                                                                                                            "policyType":  74,
                                                                                                                             "enabled":  true
                                                                                                                         }
                                                                                                                     ],
@@ -247,13 +247,13 @@
                                                                                                ],
                                                                                    "entityKey":  "@odata.type",
                                                                                    "booleanActions":  0,
-                                                                                   "policyType":  73,
+                                                                                   "policyType":  74,
                                                                                    "enabled":  true
                                                                                }
                                                               }
                                                           ],
                                               "dataType":  21,
-                                              "category":  26,
+                                              "category":  29,
                                               "nameResourceKey":  "customPolicyOMAURISettingsName",
                                               "descriptionResourceKey":  "empty",
                                               "childSettings":  [
@@ -265,7 +265,7 @@
                                               "entityKey":  "omaSettings",
                                               "booleanActions":  0,
                                               "defaultValue":  "",
-                                              "policyType":  73,
+                                              "policyType":  74,
                                               "enabled":  true
                                           }
 }

Documentation/ObjectInfo/customomasettings_windowsphonecustom.json

@@ -1,10 +1,10 @@
-{
+{
     "customomasettings_windowsphonecustom":  {
                                                  "columns":  [
                                                                  {
                                                                      "metadata":  {
                                                                                       "dataType":  20,
-                                                                                      "category":  26,
+                                                                                      "category":  29,
                                                                                       "nameResourceKey":  "nameName",
                                                                                       "descriptionResourceKey":  "empty",
                                                                                       "childSettings":  [
@@ -15,14 +15,14 @@
                                                                                                   ],
                                                                                       "entityKey":  "displayName",
                                                                                       "booleanActions":  0,
-                                                                                      "policyType":  98,
+                                                                                      "policyType":  99,
                                                                                       "enabled":  true
                                                                                   }
                                                                  },
                                                                  {
                                                                      "metadata":  {
                                                                                       "dataType":  20,
-                                                                                      "category":  26,
+                                                                                      "category":  29,
                                                                                       "nameResourceKey":  "descriptionName",
                                                                                       "descriptionResourceKey":  "empty",
                                                                                       "childSettings":  [
@@ -33,14 +33,14 @@
                                                                                                   ],
                                                                                       "entityKey":  "description",
                                                                                       "booleanActions":  0,
-                                                                                      "policyType":  98,
+                                                                                      "policyType":  99,
                                                                                       "enabled":  true
                                                                                   }
                                                                  },
                                                                  {
                                                                      "metadata":  {
                                                                                       "dataType":  20,
-                                                                                      "category":  26,
+                                                                                      "category":  29,
                                                                                       "nameResourceKey":  "oMAURIName",
                                                                                       "descriptionResourceKey":  "empty",
                                                                                       "childSettings":  [
@@ -51,14 +51,14 @@
                                                                                                   ],
                                                                                       "entityKey":  "omaUri",
                                                                                       "booleanActions":  0,
-                                                                                      "policyType":  98,
+                                                                                      "policyType":  99,
                                                                                       "enabled":  true
                                                                                   }
                                                                  },
                                                                  {
                                                                      "metadata":  {
                                                                                       "dataType":  16,
-                                                                                      "category":  26,
+                                                                                      "category":  29,
                                                                                       "nameResourceKey":  "dataTypeName",
                                                                                       "descriptionResourceKey":  "empty",
                                                                                       "childSettings":  [
@@ -75,7 +75,7 @@
                                                                                                           "children":  [
                                                                                                                            {
                                                                                                                                "dataType":  12,
-                                                                                                                               "category":  26,
+                                                                                                                               "category":  29,
                                                                                                                                "nameResourceKey":  "valueName",
                                                                                                                                "descriptionResourceKey":  "empty",
                                                                                                                                "childSettings":  [
@@ -86,7 +86,7 @@
                                                                                                                                            ],
                                                                                                                                "entityKey":  "value",
                                                                                                                                "booleanActions":  0,
-                                                                                                                               "policyType":  98,
+                                                                                                                               "policyType":  99,
                                                                                                                                "enabled":  true
                                                                                                                            }
                                                                                                                        ],
@@ -100,7 +100,7 @@
                                                                                                                                "dataEntityKey":  "value",
                                                                                                                                "filenameEntityKey":  "fileName",
                                                                                                                                "dataType":  2,
-                                                                                                                               "category":  26,
+                                                                                                                               "category":  29,
                                                                                                                                "nameResourceKey":  "vPNPolicyCustomXMLName",
                                                                                                                                "descriptionResourceKey":  "empty",
                                                                                                                                "childSettings":  [
@@ -111,7 +111,7 @@
                                                                                                                                            ],
                                                                                                                                "entityKey":  "value",
                                                                                                                                "booleanActions":  0,
-                                                                                                                               "policyType":  98,
+                                                                                                                               "policyType":  99,
                                                                                                                                "enabled":  true
                                                                                                                            }
                                                                                                                        ],
@@ -123,7 +123,7 @@
                                                                                                           "children":  [
                                                                                                                            {
                                                                                                                                "dataType":  7,
-                                                                                                                               "category":  26,
+                                                                                                                               "category":  29,
                                                                                                                                "nameResourceKey":  "valueName",
                                                                                                                                "descriptionResourceKey":  "empty",
                                                                                                                                "childSettings":  [
@@ -134,7 +134,7 @@
                                                                                                                                            ],
                                                                                                                                "entityKey":  "value",
                                                                                                                                "booleanActions":  0,
-                                                                                                                               "policyType":  98,
+                                                                                                                               "policyType":  99,
                                                                                                                                "enabled":  true
                                                                                                                            }
                                                                                                                        ],
@@ -146,7 +146,7 @@
                                                                                                           "children":  [
                                                                                                                            {
                                                                                                                                "dataType":  14,
-                                                                                                                               "category":  26,
+                                                                                                                               "category":  29,
                                                                                                                                "nameResourceKey":  "valueName",
                                                                                                                                "descriptionResourceKey":  "empty",
                                                                                                                                "childSettings":  [
@@ -157,7 +157,7 @@
                                                                                                                                            ],
                                                                                                                                "entityKey":  "value",
                                                                                                                                "booleanActions":  0,
-                                                                                                                               "policyType":  98,
+                                                                                                                               "policyType":  99,
                                                                                                                                "enabled":  true
                                                                                                                            }
                                                                                                                        ],
@@ -169,7 +169,7 @@
                                                                                                           "children":  [
                                                                                                                            {
                                                                                                                                "dataType":  20,
-                                                                                                                               "category":  26,
+                                                                                                                               "category":  29,
                                                                                                                                "nameResourceKey":  "valueName",
                                                                                                                                "descriptionResourceKey":  "empty",
                                                                                                                                "childSettings":  [
@@ -180,7 +180,7 @@
                                                                                                                                            ],
                                                                                                                                "entityKey":  "value",
                                                                                                                                "booleanActions":  0,
-                                                                                                                               "policyType":  98,
+                                                                                                                               "policyType":  99,
                                                                                                                                "enabled":  true
                                                                                                                            }
                                                                                                                        ],
@@ -192,7 +192,7 @@
                                                                                                           "children":  [
                                                                                                                            {
                                                                                                                                "dataType":  16,
-                                                                                                                               "category":  26,
+                                                                                                                               "category":  29,
                                                                                                                                "nameResourceKey":  "valueName",
                                                                                                                                "descriptionResourceKey":  "empty",
                                                                                                                                "childSettings":  [
@@ -213,7 +213,7 @@
                                                                                                                                "entityKey":  "value",
                                                                                                                                "booleanActions":  0,
                                                                                                                                "defaultValue":  false,
-                                                                                                                               "policyType":  98,
+                                                                                                                               "policyType":  99,
                                                                                                                                "enabled":  true
                                                                                                                            }
                                                                                                                        ],
@@ -227,7 +227,7 @@
                                                                                                                                "dataEntityKey":  "value",
                                                                                                                                "filenameEntityKey":  "fileName",
                                                                                                                                "dataType":  2,
-                                                                                                                               "category":  26,
+                                                                                                                               "category":  29,
                                                                                                                                "nameResourceKey":  "omaBase64Name",
                                                                                                                                "descriptionResourceKey":  "empty",
                                                                                                                                "childSettings":  [
@@ -238,7 +238,7 @@
                                                                                                                                            ],
                                                                                                                                "entityKey":  "value",
                                                                                                                                "booleanActions":  0,
-                                                                                                                               "policyType":  98,
+                                                                                                                               "policyType":  99,
                                                                                                                                "enabled":  true
                                                                                                                            }
                                                                                                                        ],
@@ -247,13 +247,13 @@
                                                                                                   ],
                                                                                       "entityKey":  "@odata.type",
                                                                                       "booleanActions":  0,
-                                                                                      "policyType":  98,
+                                                                                      "policyType":  99,
                                                                                       "enabled":  true
                                                                                   }
                                                                  }
                                                              ],
                                                  "dataType":  21,
-                                                 "category":  26,
+                                                 "category":  29,
                                                  "nameResourceKey":  "customPolicyOMAURISettingsName",
                                                  "descriptionResourceKey":  "empty",
                                                  "childSettings":  [
@@ -265,7 +265,7 @@
                                                  "entityKey":  "omaSettings",
                                                  "booleanActions":  0,
                                                  "defaultValue":  "",
-                                                 "policyType":  98,
+                                                 "policyType":  99,
                                                  "enabled":  true
                                              }
 }

Documentation/ObjectInfo/custompreferences_maccustompreferences.json

@@ -1,8 +1,8 @@
-{
+{
     "custompreferences_maccustompreferences":  [
                                                    {
                                                        "dataType":  20,
-                                                       "category":  27,
+                                                       "category":  30,
                                                        "nameResourceKey":  "customAppConfigurationDomainName",
                                                        "descriptionResourceKey":  "customAppConfigurationDomainDescription",
                                                        "emptyValueResourceKey":  "customAppConfigurationDomainEmptyValue",
@@ -14,14 +14,14 @@
                                                                    ],
                                                        "entityKey":  "bundleId",
                                                        "booleanActions":  0,
-                                                       "policyType":  56,
+                                                       "policyType":  57,
                                                        "enabled":  true
                                                    },
                                                    {
                                                        "dataEntityKey":  "configurationXml",
                                                        "filenameEntityKey":  "fileName",
                                                        "dataType":  2,
-                                                       "category":  27,
+                                                       "category":  30,
                                                        "nameResourceKey":  "customAppConfigurationFileName",
                                                        "childSettings":  [
 
@@ -31,7 +31,7 @@
                                                                    ],
                                                        "entityKey":  "configurationXml",
                                                        "booleanActions":  0,
-                                                       "policyType":  56,
+                                                       "policyType":  57,
                                                        "enabled":  true
                                                    }
                                                ]

Documentation/ObjectInfo/defender_windows10general.json

@@ -1,8 +1,8 @@
-{
+{
     "defender_windows10general":  [
                                       {
                                           "dataType":  0,
-                                          "category":  28,
+                                          "category":  31,
                                           "nameResourceKey":  "enableRealTimeMonitoringName",
                                           "descriptionResourceKey":  "empty",
                                           "childSettings":  [
@@ -14,12 +14,12 @@
                                           "entityKey":  "defenderRequireRealTimeMonitoring",
                                           "booleanActions":  2,
                                           "defaultValue":  false,
-                                          "policyType":  78,
+                                          "policyType":  79,
                                           "enabled":  true
                                       },
                                       {
                                           "dataType":  0,
-                                          "category":  28,
+                                          "category":  31,
                                           "nameResourceKey":  "enableBehaviorMonitoringName",
                                           "descriptionResourceKey":  "EnableBehaviorMonitoringDescription",
                                           "childSettings":  [
@@ -31,12 +31,12 @@
                                           "entityKey":  "defenderRequireBehaviorMonitoring",
                                           "booleanActions":  2,
                                           "defaultValue":  false,
-                                          "policyType":  78,
+                                          "policyType":  79,
                                           "enabled":  true
                                       },
                                       {
                                           "dataType":  0,
-                                          "category":  28,
+                                          "category":  31,
                                           "nameResourceKey":  "enableNetworkInspectionSystemName",
                                           "descriptionResourceKey":  "enableNetworkInspectionSystemDescription",
                                           "childSettings":  [
@@ -48,12 +48,12 @@
                                           "entityKey":  "defenderRequireNetworkInspectionSystem",
                                           "booleanActions":  2,
                                           "defaultValue":  false,
-                                          "policyType":  78,
+                                          "policyType":  79,
                                           "enabled":  true
                                       },
                                       {
                                           "dataType":  0,
-                                          "category":  28,
+                                          "category":  31,
                                           "nameResourceKey":  "scanAllDownloadsName",
                                           "descriptionResourceKey":  "empty",
                                           "childSettings":  [
@@ -65,12 +65,12 @@
                                           "entityKey":  "defenderScanDownloads",
                                           "booleanActions":  2,
                                           "defaultValue":  false,
-                                          "policyType":  78,
+                                          "policyType":  79,
                                           "enabled":  true
                                       },
                                       {
                                           "dataType":  19,
-                                          "category":  28,
+                                          "category":  31,
                                           "nameResourceKey":  "defenderScheduleScanEnableLowCpuPriorityName",
                                           "descriptionResourceKey":  "defenderScheduleScanEnableLowCpuPriorityDescription",
                                           "childSettings":  [
@@ -92,12 +92,12 @@
                                           "booleanActions":  0,
                                           "defaultValue":  false,
                                           "unconfiguredValue":  false,
-                                          "policyType":  78,
+                                          "policyType":  79,
                                           "enabled":  true
                                       },
                                       {
                                           "dataType":  19,
-                                          "category":  28,
+                                          "category":  31,
                                           "nameResourceKey":  "defenderDisableCatchupQuickScanName",
                                           "descriptionResourceKey":  "defenderDisableCatchupQuickScanDescription",
                                           "childSettings":  [
@@ -119,12 +119,12 @@
                                           "booleanActions":  0,
                                           "defaultValue":  false,
                                           "unconfiguredValue":  false,
-                                          "policyType":  78,
+                                          "policyType":  79,
                                           "enabled":  true
                                       },
                                       {
                                           "dataType":  19,
-                                          "category":  28,
+                                          "category":  31,
                                           "nameResourceKey":  "defenderDisableCatchupFullScanName",
                                           "descriptionResourceKey":  "defenderDisableCatchupFullScanDescription",
                                           "childSettings":  [
@@ -146,12 +146,12 @@
                                           "booleanActions":  0,
                                           "defaultValue":  false,
                                           "unconfiguredValue":  false,
-                                          "policyType":  78,
+                                          "policyType":  79,
                                           "enabled":  true
                                       },
                                       {
                                           "dataType":  0,
-                                          "category":  28,
+                                          "category":  31,
                                           "nameResourceKey":  "scriptScanningName",
                                           "descriptionResourceKey":  "empty",
                                           "childSettings":  [
@@ -163,12 +163,12 @@
                                           "entityKey":  "defenderScanScriptsLoadedInInternetExplorer",
                                           "booleanActions":  2,
                                           "defaultValue":  false,
-                                          "policyType":  78,
+                                          "policyType":  79,
                                           "enabled":  true
                                       },
                                       {
                                           "dataType":  0,
-                                          "category":  28,
+                                          "category":  31,
                                           "nameResourceKey":  "enableEndUserAccessToDefenderName",
                                           "descriptionResourceKey":  "empty",
                                           "childSettings":  [
@@ -180,12 +180,12 @@
                                           "entityKey":  "defenderBlockEndUserAccess",
                                           "booleanActions":  3,
                                           "defaultValue":  false,
-                                          "policyType":  78,
+                                          "policyType":  79,
                                           "enabled":  true
                                       },
                                       {
                                           "dataType":  16,
-                                          "category":  28,
+                                          "category":  31,
                                           "nameResourceKey":  "signatureUpdateIntervalInHoursName",
                                           "descriptionResourceKey":  "empty",
                                           "childSettings":  [
@@ -324,12 +324,12 @@
                                                       ],
                                           "entityKey":  "defenderSignatureUpdateIntervalInHours",
                                           "booleanActions":  0,
-                                          "policyType":  78,
+                                          "policyType":  79,
                                           "enabled":  true
                                       },
                                       {
                                           "dataType":  16,
-                                          "category":  28,
+                                          "category":  31,
                                           "nameResourceKey":  "monitorFileAndProgramActivityName",
                                           "descriptionResourceKey":  "empty",
                                           "childSettings":  [
@@ -361,12 +361,12 @@
                                           "booleanActions":  0,
                                           "defaultValue":  "userDefined",
                                           "unconfiguredValue":  "userDefined",
-                                          "policyType":  78,
+                                          "policyType":  79,
                                           "enabled":  true
                                       },
                                       {
                                           "dataType":  14,
-                                          "category":  28,
+                                          "category":  31,
                                           "nameResourceKey":  "daysToTrackResolvedMalwareName",
                                           "descriptionResourceKey":  "DaysToTrackResolvedMalwareDescription",
                                           "emptyValueResourceKey":  "daysToTrackResolvedMalwarePlaceholder",
@@ -379,12 +379,12 @@
                                           "entityKey":  "defenderDaysBeforeDeletingQuarantinedMalware",
                                           "booleanActions":  0,
                                           "defaultValue":  0,
-                                          "policyType":  78,
+                                          "policyType":  79,
                                           "enabled":  true
                                       },
                                       {
                                           "dataType":  14,
-                                          "category":  28,
+                                          "category":  31,
                                           "nameResourceKey":  "limitCPUUsageDuringScanName",
                                           "descriptionResourceKey":  "limitCPUUsageDuringScanDescription",
                                           "emptyValueResourceKey":  "limitCPUUsageDuringScanPlaceholder",
@@ -396,12 +396,12 @@
                                                       ],
                                           "entityKey":  "defenderScanMaxCpu",
                                           "booleanActions":  0,
-                                          "policyType":  78,
+                                          "policyType":  79,
                                           "enabled":  true
                                       },
                                       {
                                           "dataType":  0,
-                                          "category":  28,
+                                          "category":  31,
                                           "nameResourceKey":  "scanArchiveFilesName",
                                           "descriptionResourceKey":  "empty",
                                           "childSettings":  [
@@ -413,12 +413,12 @@
                                           "entityKey":  "defenderScanArchiveFiles",
                                           "booleanActions":  2,
                                           "defaultValue":  false,
-                                          "policyType":  78,
+                                          "policyType":  79,
                                           "enabled":  true
                                       },
                                       {
                                           "dataType":  0,
-                                          "category":  28,
+                                          "category":  31,
                                           "nameResourceKey":  "scanIncomingMailMessagesName",
                                           "descriptionResourceKey":  "empty",
                                           "childSettings":  [
@@ -430,12 +430,12 @@
                                           "entityKey":  "defenderScanIncomingMail",
                                           "booleanActions":  2,
                                           "defaultValue":  false,
-                                          "policyType":  78,
+                                          "policyType":  79,
                                           "enabled":  true
                                       },
                                       {
                                           "dataType":  0,
-                                          "category":  28,
+                                          "category":  31,
                                           "nameResourceKey":  "scanRemovableDrivesDuringFullScanName",
                                           "descriptionResourceKey":  "scanRemovableDrivesDuringFullScanDescription",
                                           "childSettings":  [
@@ -447,12 +447,12 @@
                                           "entityKey":  "defenderScanRemovableDrivesDuringFullScan",
                                           "booleanActions":  2,
                                           "defaultValue":  false,
-                                          "policyType":  78,
+                                          "policyType":  79,
                                           "enabled":  true
                                       },
                                       {
                                           "dataType":  0,
-                                          "category":  28,
+                                          "category":  31,
                                           "nameResourceKey":  "scanMappedNetworkDrivesDuringFullScanName",
                                           "descriptionResourceKey":  "readOnlyMappingDescription",
                                           "childSettings":  [
@@ -464,12 +464,12 @@
                                           "entityKey":  "defenderScanMappedNetworkDrivesDuringFullScan",
                                           "booleanActions":  2,
                                           "defaultValue":  false,
-                                          "policyType":  78,
+                                          "policyType":  79,
                                           "enabled":  true
                                       },
                                       {
                                           "dataType":  0,
-                                          "category":  28,
+                                          "category":  31,
                                           "nameResourceKey":  "scanFilesOpenedFromNetworkFoldersName",
                                           "descriptionResourceKey":  "readOnlyMappingDescription",
                                           "childSettings":  [
@@ -481,12 +481,12 @@
                                           "entityKey":  "defenderScanNetworkFiles",
                                           "booleanActions":  2,
                                           "defaultValue":  false,
-                                          "policyType":  78,
+                                          "policyType":  79,
                                           "enabled":  true
                                       },
                                       {
                                           "dataType":  0,
-                                          "category":  28,
+                                          "category":  31,
                                           "nameResourceKey":  "cloudProtectionName",
                                           "descriptionResourceKey":  "cloudProtectionDescription",
                                           "childSettings":  [
@@ -498,12 +498,12 @@
                                           "entityKey":  "defenderRequireCloudProtection",
                                           "booleanActions":  2,
                                           "defaultValue":  false,
-                                          "policyType":  78,
+                                          "policyType":  79,
                                           "enabled":  true
                                       },
                                       {
                                           "dataType":  16,
-                                          "category":  28,
+                                          "category":  31,
                                           "nameResourceKey":  "fileBlockingLevelName",
                                           "descriptionResourceKey":  "fileBlockingLevelDescription",
                                           "childSettings":  [
@@ -535,12 +535,12 @@
                                           "booleanActions":  0,
                                           "defaultValue":  "notConfigured",
                                           "unconfiguredValue":  "notConfigured",
-                                          "policyType":  78,
+                                          "policyType":  79,
                                           "enabled":  true
                                       },
                                       {
                                           "dataType":  14,
-                                          "category":  28,
+                                          "category":  31,
                                           "nameResourceKey":  "timeExtensionForFileScanName",
                                           "descriptionResourceKey":  "TimeExtensionForFileScanDescription",
                                           "emptyValueResourceKey":  "timeExtensionForFileScanPlaceholder",
@@ -553,12 +553,12 @@
                                           "entityKey":  "defenderCloudExtendedTimeout",
                                           "booleanActions":  0,
                                           "defaultValue":  0,
-                                          "policyType":  78,
+                                          "policyType":  79,
                                           "enabled":  true
                                       },
                                       {
                                           "dataType":  16,
-                                          "category":  28,
+                                          "category":  31,
                                           "nameResourceKey":  "promptUsersForSamplesSubmissionName",
                                           "descriptionResourceKey":  "promptUsersForSamplesSubmissionDescription",
                                           "childSettings":  [
@@ -595,12 +595,12 @@
                                           "booleanActions":  0,
                                           "defaultValue":  "userDefined",
                                           "unconfiguredValue":  "userDefined",
-                                          "policyType":  78,
+                                          "policyType":  79,
                                           "enabled":  true
                                       },
                                       {
                                           "dataType":  16,
-                                          "category":  28,
+                                          "category":  31,
                                           "nameResourceKey":  "timeForDailyQuickScanName",
                                           "descriptionResourceKey":  "empty",
                                           "childSettings":  [
@@ -734,12 +734,12 @@
                                                       ],
                                           "entityKey":  "defenderScheduledQuickScanTime",
                                           "booleanActions":  0,
-                                          "policyType":  78,
+                                          "policyType":  79,
                                           "enabled":  true
                                       },
                                       {
                                           "dataType":  16,
-                                          "category":  28,
+                                          "category":  31,
                                           "nameResourceKey":  "typeOfSystemScanName",
                                           "descriptionResourceKey":  "empty",
                                           "childSettings":  [
@@ -757,7 +757,7 @@
                                                               "children":  [
                                                                                {
                                                                                    "dataType":  16,
-                                                                                   "category":  28,
+                                                                                   "category":  31,
                                                                                    "nameResourceKey":  "dayScheduled",
                                                                                    "descriptionResourceKey":  "empty",
                                                                                    "childSettings":  [
@@ -816,12 +816,12 @@
                                                                                                ],
                                                                                    "entityKey":  "defenderSystemScanSchedule",
                                                                                    "booleanActions":  0,
-                                                                                   "policyType":  78,
+                                                                                   "policyType":  79,
                                                                                    "enabled":  true
                                                                                },
                                                                                {
                                                                                    "dataType":  16,
-                                                                                   "category":  28,
+                                                                                   "category":  31,
                                                                                    "nameResourceKey":  "timeScheduled",
                                                                                    "descriptionResourceKey":  "empty",
                                                                                    "childSettings":  [
@@ -955,7 +955,7 @@
                                                                                                ],
                                                                                    "entityKey":  "defenderScheduledScanTime",
                                                                                    "booleanActions":  0,
-                                                                                   "policyType":  78,
+                                                                                   "policyType":  79,
                                                                                    "enabled":  true
                                                                                }
                                                                            ],
@@ -967,7 +967,7 @@
                                                               "children":  [
                                                                                {
                                                                                    "dataType":  16,
-                                                                                   "category":  28,
+                                                                                   "category":  31,
                                                                                    "nameResourceKey":  "dayScheduled",
                                                                                    "descriptionResourceKey":  "empty",
                                                                                    "childSettings":  [
@@ -1026,12 +1026,12 @@
                                                                                                ],
                                                                                    "entityKey":  "defenderSystemScanSchedule",
                                                                                    "booleanActions":  0,
-                                                                                   "policyType":  78,
+                                                                                   "policyType":  79,
                                                                                    "enabled":  true
                                                                                },
                                                                                {
                                                                                    "dataType":  16,
-                                                                                   "category":  28,
+                                                                                   "category":  31,
                                                                                    "nameResourceKey":  "timeScheduled",
                                                                                    "descriptionResourceKey":  "empty",
                                                                                    "childSettings":  [
@@ -1165,7 +1165,7 @@
                                                                                                ],
                                                                                    "entityKey":  "defenderScheduledScanTime",
                                                                                    "booleanActions":  0,
-                                                                                   "policyType":  78,
+                                                                                   "policyType":  79,
                                                                                    "enabled":  true
                                                                                }
                                                                            ],
@@ -1176,12 +1176,12 @@
                                           "booleanActions":  0,
                                           "defaultValue":  "userDefined",
                                           "unconfiguredValue":  "userDefined",
-                                          "policyType":  78,
+                                          "policyType":  79,
                                           "enabled":  true
                                       },
                                       {
                                           "dataType":  16,
-                                          "category":  28,
+                                          "category":  31,
                                           "nameResourceKey":  "defenderPotentiallyUnwantedAppActionName",
                                           "descriptionResourceKey":  "defenderPotentiallyUnwantedAppActionDescription",
                                           "childSettings":  [
@@ -1210,12 +1210,12 @@
                                                       ],
                                           "entityKey":  "defenderPotentiallyUnwantedAppAction",
                                           "booleanActions":  0,
-                                          "policyType":  78,
+                                          "policyType":  79,
                                           "enabled":  true
                                       },
                                       {
                                           "dataType":  19,
-                                          "category":  28,
+                                          "category":  31,
                                           "nameResourceKey":  "defenderBlockOnAccessProtectionName",
                                           "descriptionResourceKey":  "defenderBlockOnAccessProtectionDesc",
                                           "childSettings":  [
@@ -1237,12 +1237,12 @@
                                           "booleanActions":  0,
                                           "defaultValue":  false,
                                           "unconfiguredValue":  false,
-                                          "policyType":  78,
+                                          "policyType":  79,
                                           "enabled":  true
                                       },
                                       {
                                           "dataType":  16,
-                                          "category":  28,
+                                          "category":  31,
                                           "nameResourceKey":  "defenderScheduleScanDayName",
                                           "descriptionResourceKey":  "defenderScheduleScanDayDesc",
                                           "childSettings":  [
@@ -1299,18 +1299,18 @@
                                           "booleanActions":  0,
                                           "defaultValue":  "everyday",
                                           "unconfiguredValue":  "everyday",
-                                          "policyType":  78,
+                                          "policyType":  79,
                                           "enabled":  false
                                       },
                                       {
                                           "dataType":  0,
-                                          "category":  28,
+                                          "category":  31,
                                           "nameResourceKey":  "defenderDetectedMalwareActionsName",
                                           "descriptionResourceKey":  "defenderDetectedMalwareActionsDescription",
                                           "childSettings":  [
                                                                 {
                                                                     "dataType":  16,
-                                                                    "category":  28,
+                                                                    "category":  31,
                                                                     "nameResourceKey":  "LowSeverity",
                                                                     "descriptionResourceKey":  "empty",
                                                                     "childSettings":  [
@@ -1357,12 +1357,12 @@
                                                                     "booleanActions":  0,
                                                                     "defaultValue":  "deviceDefault",
                                                                     "unconfiguredValue":  "deviceDefault",
-                                                                    "policyType":  78,
+                                                                    "policyType":  79,
                                                                     "enabled":  true
                                                                 },
                                                                 {
                                                                     "dataType":  16,
-                                                                    "category":  28,
+                                                                    "category":  31,
                                                                     "nameResourceKey":  "ModerateSeverity",
                                                                     "descriptionResourceKey":  "empty",
                                                                     "childSettings":  [
@@ -1409,12 +1409,12 @@
                                                                     "booleanActions":  0,
                                                                     "defaultValue":  "deviceDefault",
                                                                     "unconfiguredValue":  "deviceDefault",
-                                                                    "policyType":  78,
+                                                                    "policyType":  79,
                                                                     "enabled":  true
                                                                 },
                                                                 {
                                                                     "dataType":  16,
-                                                                    "category":  28,
+                                                                    "category":  31,
                                                                     "nameResourceKey":  "HighSeverity",
                                                                     "descriptionResourceKey":  "empty",
                                                                     "childSettings":  [
@@ -1461,12 +1461,12 @@
                                                                     "booleanActions":  0,
                                                                     "defaultValue":  "deviceDefault",
                                                                     "unconfiguredValue":  "deviceDefault",
-                                                                    "policyType":  78,
+                                                                    "policyType":  79,
                                                                     "enabled":  true
                                                                 },
                                                                 {
                                                                     "dataType":  16,
-                                                                    "category":  28,
+                                                                    "category":  31,
                                                                     "nameResourceKey":  "SevereSeverity",
                                                                     "descriptionResourceKey":  "empty",
                                                                     "childSettings":  [
@@ -1513,7 +1513,7 @@
                                                                     "booleanActions":  0,
                                                                     "defaultValue":  "deviceDefault",
                                                                     "unconfiguredValue":  "deviceDefault",
-                                                                    "policyType":  78,
+                                                                    "policyType":  79,
                                                                     "enabled":  true
                                                                 }
                                                             ],
@@ -1523,12 +1523,12 @@
                                           "entityKey":  "syntheticDefenderDetectedMalwareActionsEnabled",
                                           "booleanActions":  2,
                                           "defaultValue":  false,
-                                          "policyType":  78,
+                                          "policyType":  79,
                                           "enabled":  true
                                       },
                                       {
                                           "dataType":  9,
-                                          "category":  28,
+                                          "category":  31,
                                           "childSettings":  [
                                                                 {
                                                                     "complexOptions":  [
@@ -1537,7 +1537,7 @@
                                                                                                                {
                                                                                                                    "metadata":  {
                                                                                                                                     "dataType":  20,
-                                                                                                                                    "category":  28,
+                                                                                                                                    "category":  31,
                                                                                                                                     "nameResourceKey":  "nameColumn",
                                                                                                                                     "emptyValueResourceKey":  "nameColumnExamples",
                                                                                                                                     "childSettings":  [
@@ -1548,13 +1548,13 @@
                                                                                                                                                 ],
                                                                                                                                     "entityKey":  "nameColumn",
                                                                                                                                     "booleanActions":  0,
-                                                                                                                                    "policyType":  78,
+                                                                                                                                    "policyType":  79,
                                                                                                                                     "enabled":  true
                                                                                                                                 }
                                                                                                                }
                                                                                                            ],
                                                                                                "dataType":  21,
-                                                                                               "category":  28,
+                                                                                               "category":  31,
                                                                                                "nameResourceKey":  "filesAndFoldersToExcludeName",
                                                                                                "descriptionResourceKey":  "empty",
                                                                                                "childSettings":  [
@@ -1565,7 +1565,7 @@
                                                                                                            ],
                                                                                                "entityKey":  "defenderFilesAndFoldersToExclude",
                                                                                                "booleanActions":  0,
-                                                                                               "policyType":  78,
+                                                                                               "policyType":  79,
                                                                                                "enabled":  true
                                                                                            },
                                                                                            {
@@ -1573,7 +1573,7 @@
                                                                                                                {
                                                                                                                    "metadata":  {
                                                                                                                                     "dataType":  20,
-                                                                                                                                    "category":  28,
+                                                                                                                                    "category":  31,
                                                                                                                                     "nameResourceKey":  "extensionsColumn",
                                                                                                                                     "emptyValueResourceKey":  "extensionsColumnExamples",
                                                                                                                                     "childSettings":  [
@@ -1584,13 +1584,13 @@
                                                                                                                                                 ],
                                                                                                                                     "entityKey":  "extensionsColumn",
                                                                                                                                     "booleanActions":  0,
-                                                                                                                                    "policyType":  78,
+                                                                                                                                    "policyType":  79,
                                                                                                                                     "enabled":  true
                                                                                                                                 }
                                                                                                                }
                                                                                                            ],
                                                                                                "dataType":  21,
-                                                                                               "category":  28,
+                                                                                               "category":  31,
                                                                                                "nameResourceKey":  "fileExtensionsToExcludeName",
                                                                                                "descriptionResourceKey":  "empty",
                                                                                                "childSettings":  [
@@ -1601,7 +1601,7 @@
                                                                                                            ],
                                                                                                "entityKey":  "defenderFileExtensionsToExclude",
                                                                                                "booleanActions":  0,
-                                                                                               "policyType":  78,
+                                                                                               "policyType":  79,
                                                                                                "enabled":  true
                                                                                            },
                                                                                            {
@@ -1609,7 +1609,7 @@
                                                                                                                {
                                                                                                                    "metadata":  {
                                                                                                                                     "dataType":  20,
-                                                                                                                                    "category":  28,
+                                                                                                                                    "category":  31,
                                                                                                                                     "nameResourceKey":  "processesColumn",
                                                                                                                                     "emptyValueResourceKey":  "processesColumnExamples",
                                                                                                                                     "childSettings":  [
@@ -1620,13 +1620,13 @@
                                                                                                                                                 ],
                                                                                                                                     "entityKey":  "processesColumn",
                                                                                                                                     "booleanActions":  0,
-                                                                                                                                    "policyType":  78,
+                                                                                                                                    "policyType":  79,
                                                                                                                                     "enabled":  true
                                                                                                                                 }
                                                                                                                }
                                                                                                            ],
                                                                                                "dataType":  21,
-                                                                                               "category":  28,
+                                                                                               "category":  31,
                                                                                                "nameResourceKey":  "processesToExcludeName",
                                                                                                "descriptionResourceKey":  "empty",
                                                                                                "childSettings":  [
@@ -1637,12 +1637,12 @@
                                                                                                            ],
                                                                                                "entityKey":  "defenderProcessesToExclude",
                                                                                                "booleanActions":  0,
-                                                                                               "policyType":  78,
+                                                                                               "policyType":  79,
                                                                                                "enabled":  true
                                                                                            }
                                                                                        ],
                                                                     "dataType":  5,
-                                                                    "category":  28,
+                                                                    "category":  31,
                                                                     "nameResourceKey":  "DefenderExclusions",
                                                                     "childSettings":  [
 
@@ -1651,7 +1651,7 @@
 
                                                                                 ],
                                                                     "booleanActions":  0,
-                                                                    "policyType":  78,
+                                                                    "policyType":  79,
                                                                     "enabled":  true
                                                                 }
                                                             ],
@@ -1659,7 +1659,7 @@
 
                                                       ],
                                           "booleanActions":  0,
-                                          "policyType":  78,
+                                          "policyType":  79,
                                           "enabled":  true
                                       }
                                   ]