3.9.0

Find certificate by thumbprint in store

ADMXImport.md

@@ -14,11 +14,11 @@ Microsoft links:
 
 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.
 
-![Screenshot](/ADMXExample.png?raw=true)
+<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)
 
-![Screenshot](/ADMXSettingExample.png?raw=true)
+<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. 
 
@@ -26,13 +26,13 @@ The *Intune OMA-URI name* property specifies the name of the OMA-URI row in the
 
 A policy must be set to Enabled before any changes can be made. The *Policy* tab will list all possible settings for the policy. This could be a dropdown box, text box, check box, numeric up-down box etc. The script creates the controls based on the presentation settings in the ADML file. An ADML is not mandatory but the controls and the UI could cause unpredictive results. Always use the associated ADML for correctly generated controls.
 
-![Screenshot](/ADMXSettingExampleOMAURI.png?raw=true)
+<img src="https://raw.githubusercontent.com/Micke-K/IntuneManagement/master/ADMXSettingExampleOMAURI.png" height="50%" width="50%"/>
 
 The *OMA-URI Settings* tab contains the configured settings. This is the string that will be added to the enabled policy. This can be manually configure in case there is something that is not supported by the script. Do **NOT** add <enabled /> or <disabled /> to this text box. The script will add that automatically.  If *Manual configuration* is checked, the script will upload the text as it is specified, including additional manual changes. If it is not checked, the script will generate the text when importing the profile. If manual configuration is added and then checkbox is cleared, those changes will be lost during the upload.
 
 The *XML Definition* tab contains the XML node for the ADMX policy. This is used for reference in case manual configuration is required.
 
-![Screenshot](/ADMXImportSetting.png?raw=true)
+<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.  
 
@@ -50,7 +50,7 @@ The *Import* button will create the Custom Profile in Intune. There is no visual
 
 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.  
 
-![Screenshot](/ADMXRegValuePolicy.png?raw=true)
+<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.
 
@@ -82,39 +82,39 @@ The *Additional value settings* section has additional settings for a policy typ
 
 Example of setting registry values for a device and a user: 
 
-![Screenshot](/RegPolicyHKCU.png?raw=true)
+<img src="https://raw.githubusercontent.com/Micke-K/IntuneManagement/master/RegPolicyHKCU.png" height="50%" width="50%"/>
 
 Example of adding HKCU settings
 
-![Screenshot](/RegPolicyHKLM.png?raw=true)
+<img src="https://raw.githubusercontent.com/Micke-K/IntuneManagement/master/RegPolicyHKLM.png" height="50%" width="50%"/>
 
 Example of adding HKLM settings
 
-![Screenshot](/RegADMXFileContent.png?raw=true)
+<img src="https://raw.githubusercontent.com/Micke-K/IntuneManagement/master/RegADMXFileContent.png" height="50%" width="50%"/>
 
 Example of generated ADMX file
 
-![Screenshot](/RegValueIntuneProfile.png?raw=true)
+<img src="https://raw.githubusercontent.com/Micke-K/IntuneManagement/master/RegValueIntuneProfile.png" height="50%" width="50%"/>
 
 Example of the created Custom Profile created. 
 
-![Screenshot](/RegProfileADMXIngestion.png?raw=true)
+<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.
 
-![Screenshot](/RegProfileOMAURISetting.png?raw=true)
+<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.
 
-![Screenshot](/RegValuesHKCU.png?raw=true)
+<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
 
-![Screenshot](/RegValuesHKLM.png?raw=true)
+<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
 
-![Screenshot](/RegValuesHKLMList.png?raw=true)
+<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 
 
@@ -142,7 +142,7 @@ The Policy CSP will create multiple registry values under HKLM\Software\Microsof
 
 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.
 
-![Screenshot](/RegADMXDefault.png?raw=true)
+<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.
 
@@ -170,11 +170,11 @@ The CategoryPath is the full path to the category where the setting is defined.
 
 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. 
 
-![Screenshot](/RegADMXProvider.png?raw=true)
+<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.
 
-![Screenshot](/RegADMXCurrent.png?raw=true)
+<img src="https://raw.githubusercontent.com/Micke-K/IntuneManagement/master/RegADMXCurrent.png" height="50%" width="50%"/>
 
 **Troubleshooting**
 

CloudAPIPowerShellManagement.psm1

@@ -69,7 +69,23 @@ function Initialize-CloudAPIManagement
         [string]
         $View = "",
         [switch]
-        $ShowConsoleWindow
+        $ShowConsoleWindow,
+        [switch]
+        $JSonSettings,
+        [string]
+        $JSonFile,
+        [switch]
+        $Silent,
+        [string]
+        $SilentBatchFile,
+        [string]
+        $tenantId,
+        [string]
+        $appId,
+        [string]
+        $secret,
+        [string]
+        $certificate
     )
 
     $global:wpfNS = "xmlns='http://schemas.microsoft.com/winfx/2006/xaml/presentation' xmlns:x='http://schemas.microsoft.com/winfx/2006/xaml'"
@@ -77,6 +93,12 @@ function Initialize-CloudAPIManagement
     [void] [System.Reflection.Assembly]::LoadWithPartialName("System.Windows.Forms") 
     Add-Type -AssemblyName PresentationFramework
 
+    $global:hideUI = ($Silent -eq $true)
+    $global:SilentBatchFile = $SilentBatchFile
+
+    if($global:hideUI -ne $true)
+    {        
+        # Run with UI
         try 
         {
             [xml]$xaml = Get-Content ([IO.Path]::GetDirectoryName($PSCommandPath) + "\Xaml\SplashScreen.xaml")
@@ -93,17 +115,49 @@ 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 
+        $global:AzureAppId = $appId 
+        $global:ClientSecret = $secret 
+        $global:ClientCert = $certificate        
+    }
 
     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

@@ -54,6 +54,8 @@ This is the first version of the documentation support.
 
 * Some Endpoint Security/Settings Catalog items is not translated based on Graph API in the portal e.g. *Antivirus - Windows 10 and Windows Server (ConfigMgr)* policies.  These will be documented based on Graph API information which might be different compared to the portal
 
+* Markdown is currently in experimental state. The script can document to an MD file created in the Documents folder but this can be to large in environments with many objects. The script will create HTML tables to support code blocks and column span. The MD View must support HTML tables to display the document. The *Markdown Viewer* extension in Chrome was used during testing.
+
 Please create an [Issue](https://github.com/Micke-K/IntuneManagement/issues) if properties are documented incorrectly or missing. 
 
 # Deep Dive
@@ -64,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
 
@@ -130,7 +132,7 @@ The priority order for object documentation is:
 
 **Documentation Provider**
 
-The documentation provider takes care of collecting all the information about the object. The `DocumentationCustom.psm1`file is an example of this. This file has examples of custom translation of properties for json files and examples of custom translation of objects via a PowerShell functions.
+The documentation provider takes care of collecting all the information about the object. The `DocumentationCustom.psm1` file is an example of this. This file has examples of custom translation of properties for json files and examples of custom translation of objects via a PowerShell functions.
 
 Documentation providers has a Priority property. This defines in what order the providers will be triggered. The provider with the lowest priority number will be executed first. The included custom documentation provider has a priority number of 1000. The information gathering of the provider can be overridden by creating a custom documentation provider with a lower priority number.
 
@@ -138,7 +140,7 @@ Documentation providers has a Priority property. This defines in what order the
 
 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,146 +2,154 @@
     "0":  "AirPlay",
     "1":  "AirPrint",
     "2":  "AndroidDeviceOwnerApplications",
-    "3":  "ApplicationGuard",
+    "3":  "AndroidDeviceOwnerPolicyMessages",
-    "4":  "ApplicationRestrictions",
+    "4":  "ApplicationGuard",
-    "5":  "ApplicationVisibility",
+    "5":  "ApplicationRestrictions",
-    "6":  "Applications",
+    "6":  "ApplicationVisibility",
-    "7":  "ApplicationsAndGames",
+    "7":  "Applications",
-    "8":  "ApplicationsAndGoogle",
+    "8":  "ApplicationsAndGames",
-    "9":  "AppManagement",
+    "9":  "ApplicationsAndGoogle",
-    "10":  "AppsAndExperience",
+    "10":  "AppManagement",
-    "11":  "AssociatedDomains",
+    "11":  "AppsAndExperience",
-    "12":  "AutonomousSingleAppMode",
+    "12":  "AssociatedDomains",
-    "13":  "AzureOperationalInsights",
+    "13":  "AutonomousSingleAppMode",
-    "14":  "BitLocker",
+    "14":  "AzureOperationalInsights",
-    "15":  "Browser",
+    "15":  "BitLocker",
-    "16":  "BuiltinApps",
+    "16":  "BootOptions",
-    "17":  "Cellular",
+    "17":  "Browser",
-    "18":  "CloudAndStorage",
+    "18":  "BuiltinApps",
-    "19":  "CloudPrint",
+    "19":  "Cameras",
-    "20":  "ConnectedDevices",
+    "20":  "Cellular",
-    "21":  "Connectivity",
+    "21":  "CloudAndStorage",
-    "22":  "ContentCaching",
+    "22":  "CloudPrint",
-    "23":  "ControlPanelAndSettings",
+    "23":  "ConnectedDevices",
-    "24":  "CredentialGuard",
+    "24":  "Connectivity",
-    "25":  "CustomConfiguration",
+    "25":  "ContentCaching",
-    "26":  "CustomOMASettings",
+    "26":  "ControlPanelAndSettings",
-    "27":  "CustomPreferences",
+    "27":  "CredentialGuard",
-    "28":  "Defender",
+    "28":  "CustomConfiguration",
-    "29":  "DefenderExclusions",
+    "29":  "CustomOMASettings",
-    "30":  "DefenderExploitGuard",
+    "30":  "CustomPreferences",
-    "31":  "DefenderSecurityCenter",
+    "31":  "Defender",
-    "32":  "DefenderLocalSecurityOptions",
+    "32":  "DefenderExclusions",
-    "33":  "DefenderFirewall",
+    "33":  "DefenderExploitGuard",
-    "34":  "DeliveryOptimization",
+    "34":  "DefenderSecurityCenter",
-    "35":  "DerivedCredentialAuthenticationConfiguration",
+    "35":  "DefenderLocalSecurityOptions",
-    "36":  "DeviceHealth",
+    "36":  "DefenderFirewall",
-    "37":  "DeviceAccount",
+    "37":  "DeliveryOptimization",
-    "38":  "DeviceGuard",
+    "38":  "DerivedCredentialAuthenticationConfiguration",
-    "39":  "DevicePassword",
+    "39":  "DeviceHealth",
-    "40":  "DeviceProperties",
+    "40":  "DeviceAccount",
-    "41":  "DeviceRestrictions",
+    "41":  "DeviceGuard",
-    "42":  "DeviceSecurity",
+    "42":  "DevicePassword",
-    "43":  "DeviceExperience",
+    "43":  "DeviceProperties",
-    "44":  "Display",
+    "44":  "DeviceRestrictions",
-    "45":  "Domains",
+    "45":  "DeviceSecurity",
-    "46":  "EditionUpgrade",
+    "46":  "DeviceExperience",
-    "47":  "SMode",
+    "47":  "DFCISecuritySettings",
-    "48":  "EdgeBrowser",
+    "48":  "Display",
-    "49":  "EdgeBrowserSmartScreen",
+    "49":  "Domains",
-    "50":  "EnterpriseDataProtection",
+    "50":  "EditionUpgrade",
-    "51":  "EducationTeacherCerts",
+    "51":  "SMode",
-    "52":  "EducationStudentCerts",
+    "52":  "EdgeBrowser",
-    "53":  "EducationTakeATest",
+    "53":  "EdgeBrowserSmartScreen",
-    "54":  "EmailProfile",
+    "54":  "EnterpriseDataProtection",
-    "55":  "ExpeditedCheckin",
+    "55":  "EducationTeacherCerts",
-    "56":  "ExtensibleSingleSignOn",
+    "56":  "EducationStudentCerts",
-    "57":  "FileVault",
+    "57":  "EducationTakeATest",
-    "58":  "Firewall",
+    "58":  "EmailProfile",
-    "59":  "Gatekeeper",
+    "59":  "ExpeditedCheckin",
-    "60":  "HealthMonitoring",
+    "60":  "ExtensibleSingleSignOn",
-    "61":  "HomeScreenLayout",
+    "61":  "FileVault",
-    "62":  "ComplianceEmailProfile",
+    "62":  "Firewall",
-    "63":  "IosEducation",
+    "63":  "Gatekeeper",
-    "64":  "IOSWallpaper",
+    "64":  "HealthMonitoring",
-    "65":  "ImportedPFX",
+    "65":  "HomeScreenLayout",
-    "66":  "KernelExtensions",
+    "66":  "ComplianceEmailProfile",
-    "67":  "KeyboardAndDictionary",
+    "67":  "IosEducation",
-    "68":  "Kiosk",
+    "68":  "IOSWallpaper",
-    "69":  "KioskAndroidEnterprise",
+    "69":  "ImportedPFX",
-    "70":  "KioskConfiguration",
+    "70":  "KernelExtensions",
-    "71":  "KioskConfigurationV2",
+    "71":  "KeyboardAndDictionary",
-    "72":  "KioskWebBrowser",
+    "72":  "Kiosk",
-    "73":  "EdgeKiosk",
+    "73":  "KioskAndroidEnterprise",
-    "74":  "LockedScreenExperience",
+    "74":  "KioskConfiguration",
-    "75":  "LockScreenMessage",
+    "75":  "KioskConfigurationV2",
-    "76":  "Logging",
+    "76":  "KioskWebBrowser",
-    "77":  "LoginItems",
+    "77":  "EdgeKiosk",
-    "78":  "LoginWindow",
+    "78":  "LockedScreenExperience",
-    "79":  "Malware",
+    "79":  "LockScreenMessage",
-    "80":  "Maintenance",
+    "80":  "Logging",
-    "81":  "Messaging",
+    "81":  "LoginItems",
-    "82":  "NetworkProxy",
+    "82":  "LoginWindow",
-    "83":  "NetworkBoundary",
+    "83":  "Malware",
-    "84":  "Notifications",
+    "84":  "Maintenance",
-    "85":  "Password",
+    "85":  "Messaging",
-    "86":  "Personalization",
+    "86":  "MicrophonesAndSpeakers",
-    "87":  "PersonalProfile",
+    "87":  "NetworkProxy",
-    "88":  "PKCS",
+    "88":  "NetworkBoundary",
-    "89":  "PolicyOverride",
+    "89":  "Notifications",
-    "90":  "PowerSettings",
+    "90":  "Password",
-    "91":  "Printer",
+    "91":  "Personalization",
-    "92":  "Privacy",
+    "92":  "PersonalProfile",
-    "93":  "PrivacyPerApp",
+    "93":  "PKCS",
-    "94":  "PrivacyPreferences",
+    "94":  "PolicyOverride",
-    "95":  "Projection",
+    "95":  "Ports",
-    "96":  "SCEPProperties",
+    "96":  "PowerSettings",
-    "97":  "SharedDevice",
+    "97":  "Printer",
-    "98":  "SharedPCAccountManager",
+    "98":  "Privacy",
-    "99":  "SingleSignOn",
+    "99":  "PrivacyPerApp",
-    "100":  "Search",
+    "100":  "PrivacyPreferences",
-    "101":  "Session",
+    "101":  "Projection",
-    "102":  "SmartScreen",
+    "102":  "Radios",
-    "103":  "SoftwareUpdates",
+    "103":  "SCEPProperties",
-    "104":  "Start",
+    "104":  "SharedDevice",
-    "105":  "SystemExtensions",
+    "105":  "SharedPCAccountManager",
-    "106":  "SystemSecurity",
+    "106":  "SingleSignOn",
-    "107":  "SCCMCompliance",
+    "107":  "Search",
-    "108":  "TrustedCert",
+    "108":  "Session",
-    "109":  "Unsupported",
+    "109":  "SmartScreen",
-    "110":  "Updates",
+    "110":  "SoftwareUpdates",
-    "111":  "UsersAndAccounts",
+    "111":  "Start",
-    "112":  "WiFi",
+    "112":  "SystemExtensions",
-    "113":  "Win10Wifi",
+    "113":  "SystemSecurity",
-    "114":  "WindowsAtp",
+    "114":  "SCCMCompliance",
-    "115":  "WindowsSpotlight",
+    "115":  "TrustedCert",
-    "116":  "Wireless",
+    "116":  "UEFIAccess",
-    "117":  "WirelessProjection",
+    "117":  "Unsupported",
-    "118":  "WorkProfile",
+    "118":  "Updates",
-    "119":  "WorkProfilePassword",
+    "119":  "UsersAndAccounts",
-    "120":  "VPN",
+    "120":  "WakeSettings",
-    "121":  "VPNApps",
+    "121":  "WiFi",
-    "122":  "VPNConnectivity",
+    "122":  "Win10Wifi",
-    "123":  "VPNSplitTunneling",
+    "123":  "WindowsAtp",
-    "124":  "VPNAppsAndTrafficRules",
+    "124":  "WindowsSpotlight",
-    "125":  "VPNConditionalAccess",
+    "125":  "Wireless",
-    "126":  "VPNDNSTriggers",
+    "126":  "WirelessProjection",
-    "127":  "VPNIKEv2",
+    "127":  "WorkProfile",
-    "128":  "VPNProxy",
+    "128":  "WorkProfilePassword",
-    "129":  "VPNTrustedNetwork",
+    "129":  "VPN",
-    "130":  "VPNCustomData",
+    "130":  "VPNApps",
-    "131":  "WebContentFilter",
+    "131":  "VPNConnectivity",
-    "132":  "XboxServices",
+    "132":  "VPNSplitTunneling",
-    "133":  "DomainJoin",
+    "133":  "VPNAppsAndTrafficRules",
-    "134":  "WindowsDefenderAtp",
+    "134":  "VPNConditionalAccess",
-    "135":  "WindowsHelloForBusiness",
+    "135":  "VPNDNSTriggers",
-    "136":  "DeviceFirmwareConfigurationInterface",
+    "136":  "VPNIKEv2",
-    "137":  "ZebraMx",
+    "137":  "VPNProxy",
-    "138":  "AndroidDefenderAtp",
+    "138":  "VPNTrustedNetwork",
-    "139":  "MacDefenderAtp",
+    "139":  "VPNCustomData",
-    "140":  "UserRights",
+    "140":  "WebContentFilter",
-    "141":  "WiredNetwork",
+    "141":  "XboxServices",
-    "142":  "DefenderAntivirus",
+    "142":  "DomainJoin",
-    "143":  "CustomCompliance",
+    "143":  "WindowsDefenderAtp",
-    "144":  "IosDefenderAtp"
+    "144":  "WindowsHelloForBusiness",
+    "145":  "ZebraMx",
+    "146":  "AndroidDefenderAtp",
+    "147":  "MacDefenderAtp",
+    "148":  "UserRights",
+    "149":  "WiredNetwork",
+    "150":  "DefenderAntivirus",
+    "151":  "CustomCompliance",
+    "152":  "IosDefenderAtp"
 }

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/ObjectCategories.json

@@ -114,7 +114,8 @@
                            "AndroidDeviceOwnerApplications",
                            "VPNConnectivity",
                            "WorkProfilePassword",
-                           "PersonalProfile"
+                           "PersonalProfile",
+                           "AndroidDeviceOwnerPolicyMessages"
                        ],
         "ShowDisabled":  true
     },
@@ -413,6 +414,51 @@
                            "DeviceRestrictions"
                        ]
     },
+    {
+        "ObjectType":  "#microsoft.graph.aospDeviceOwnerEnterpriseWiFiConfiguration",
+        "PolicyType":  "AOSPDeviceOwnerWiFi",
+        "PolicyTypeLanguageId":  "wiFi",
+        "PlatformLanguageId":  "AndroidAOSP",
+        "Categories":  [
+
+                       ]
+    },
+    {
+        "ObjectType":  "#microsoft.graph.aospDeviceOwnerTrustedRootCertificate",
+        "PolicyType":  "AOSPDeviceOwnerTrustedCertificate",
+        "PolicyTypeLanguageId":  "trustedCertificate",
+        "PlatformLanguageId":  "AndroidAOSP",
+        "Categories":  [
+
+                       ]
+    },
+    {
+        "ObjectType":  "#microsoft.graph.aospDeviceOwnerPkcsCertificateProfile",
+        "PolicyType":  "AOSPDeviceOwnerPKCS",
+        "PolicyTypeLanguageId":  "pkcsCertificate",
+        "PlatformLanguageId":  "AndroidAOSP",
+        "Categories":  [
+
+                       ]
+    },
+    {
+        "ObjectType":  "#microsoft.graph.aospDeviceOwnerScepCertificateProfile",
+        "PolicyType":  "AOSPDeviceOwnerSCEP",
+        "PolicyTypeLanguageId":  "scepCertificate",
+        "PlatformLanguageId":  "AndroidAOSP",
+        "Categories":  [
+
+                       ]
+    },
+    {
+        "ObjectType":  "#microsoft.graph.aospDeviceOwnerWiFiConfiguration",
+        "PolicyType":  "AOSPDeviceOwnerWiFi",
+        "PolicyTypeLanguageId":  "wiFi",
+        "PlatformLanguageId":  "AndroidAOSP",
+        "Categories":  [
+
+                       ]
+    },
     {
         "ObjectType":  "#microsoft.graph.editionUpgradeConfiguration",
         "PolicyType":  "WindowsEditionUpgrade",
@@ -799,7 +845,14 @@
         "PolicyTypeLanguageId":  "deviceFirmwareConfigurationInterface",
         "PlatformLanguageId":  "Windows10",
         "Categories":  [
-                           "DeviceFirmwareConfigurationInterface"
+                           "UEFIAccess",
+                           "DFCISecuritySettings",
+                           "Cameras",
+                           "MicrophonesAndSpeakers",
+                           "Radios",
+                           "BootOptions",
+                           "Ports",
+                           "WakeSettings"
                        ]
     },
     {
@@ -961,13 +1014,7 @@
         "PolicyTypeLanguageId":  "vpn",
         "PlatformLanguageId":  "Windows10",
         "Categories":  [
-                           "vpn",
+                           "vpn"
-                           "vpnappsandtrafficrules",
-                           "vpnconditionalaccess",
-                           "vpndnstriggers",
-                           "vpnproxy",
-                           "vpnsplittunneling",
-                           "vpntrustednetwork"
                        ]
     },
     {
@@ -1114,6 +1161,15 @@
                            "Win10Wifi"
                        ]
     },
+    {
+        "ObjectType":  "#microsoft.graph.windowsWiredNetworkConfiguration",
+        "PolicyType":  "Windows10WiredNetwork",
+        "PolicyTypeLanguageId":  "wiredNetwork",
+        "PlatformLanguageId":  "Windows10",
+        "Categories":  [
+
+                       ]
+    },
     {
         "ObjectType":  "#microsoft.graph.windowsWifiEnterpriseEAPConfiguration",
         "PolicyType":  "Windows10WiFi",
@@ -1320,5 +1376,23 @@
         "Categories":  [
 
                        ]
+    },
+    {
+        "ObjectType":  "settingsCatalogLinux",
+        "PolicyType":  "SettingsCatalogLinux",
+        "PolicyTypeLanguageId":  "settingsCatalog",
+        "PlatformLanguageId":  "Linux",
+        "Categories":  [
+
+                       ]
+    },
+    {
+        "ObjectType":  "settingsCatalogIOS",
+        "PolicyType":  "SettingsCatalogIOS",
+        "PolicyTypeLanguageId":  "settingsCatalog",
+        "PlatformLanguageId":  "Ios",
+        "Categories":  [
+
+                       ]
     }
 ]

Documentation/ObjectInfo/#AppConfigOutlookDevice.json

@@ -11,7 +11,7 @@
         "entityKey":  "configureEmail",
         "dataType":  0,
         "booleanActions":  109,
-        "category": 103
+        "category": "TableHeaders.settings"
     },
     {
         "nameResourceKey":  "Inputs.authenticationType",
@@ -19,7 +19,7 @@
         "entityKey":  "com.microsoft.outlook.EmailProfile.AccountType",
         "dataType":  16,
         "booleanActions":  0,
-        "category": 103,
+        "category": "TableHeaders.settings",
         "options":  [                                
             {
                 "nameResourceKey":  "Inputs.basicAuth",
@@ -37,7 +37,7 @@
         "entityKey":  "com.microsoft.outlook.EmailProfile.EmailUPN",
         "dataType":  16,
         "booleanActions":  0,
-        "category": 103,
+        "category": "TableHeaders.settings",
         "options":  [                                
             {
                 "nameResourceKey":  "userPrincipalNameOption",
@@ -58,7 +58,7 @@
         "entityKey":  "com.microsoft.outlook.EmailProfile.AccountDomain",
         "dataType":  20,
         "booleanActions":  0,
-        "category": 103,
+        "category": "TableHeaders.settings",
         "Condition": {
             "Expressions": [
                 {
@@ -74,7 +74,7 @@
         "entityKey":  "com.microsoft.outlook.EmailProfile.EmailAddress",
         "dataType":  16,
         "booleanActions":  0,
-        "category": 103,
+        "category": "TableHeaders.settings",
         "options":  [                                
             {
                 "nameResourceKey":  "userPrincipalNameOption",
@@ -92,7 +92,7 @@
         "entityKey":  "com.microsoft.outlook.EmailProfile.ServerHostName",
         "dataType":  20,
         "booleanActions":  0,
-        "category": 103,
+        "category": "TableHeaders.settings",
         "Condition": {
             "Expressions": [
                 {
@@ -108,7 +108,7 @@
         "entityKey":  "com.microsoft.outlook.EmailProfile.EmailAccountName",
         "dataType":  20,
         "booleanActions":  0,
-        "category": 103,
+        "category": "TableHeaders.settings",
         "Condition": {
             "Expressions": [
                 {
@@ -124,7 +124,7 @@
         "entityKey":  "IntuneMAMAllowedAccountsOnly",
         "dataType":  16,
         "booleanActions":  0,
-        "category": 103,
+        "category": "TableHeaders.settings",
         "Condition": {
             "Expressions": [
                 {
@@ -158,7 +158,7 @@
         "entityKey":  "com.microsoft.outlook.Mail.FocusedInbox",
         "dataType":  0,
         "booleanActions":  120,
-        "category": 103
+        "category": "TableHeaders.settings"
     },
     {
         "nameResourceKey":  "OutlookAppConfig.allowBiometricsTitle",
@@ -166,7 +166,7 @@
         "entityKey":  "com.microsoft.outlook.Auth.Biometric",
         "dataType":  0,
         "booleanActions":  120,
-        "category": 103
+        "category": "TableHeaders.settings"
     },
     {
         "nameResourceKey":  "OutlookAppConfig.allowUserChangeTitle",
@@ -176,7 +176,7 @@
         "booleanActions":  109,
         "unconfiguredValue": true,
         "allowMissing": true,
-        "category": 103,
+        "category": "TableHeaders.settings",
         "Condition": {
             "Expressions": [
                 {
@@ -192,7 +192,7 @@
         "entityKey":  "com.microsoft.outlook.Contacts.LocalSyncEnabled",
         "dataType":  0,
         "booleanActions":  120,
-        "category": 103
+        "category": "TableHeaders.settings"
     },
     {
         "nameResourceKey":  "OutlookAppConfig.allowUserChangeTitle",
@@ -202,7 +202,7 @@
         "booleanActions":  109,
         "unconfiguredValue": true,
         "allowMissing": true,
-        "category": 103,
+        "category": "TableHeaders.settings",
         "Condition": {
             "Expressions": [
                 {
@@ -218,7 +218,7 @@
         "entityKey":  "com.microsoft.outlook.Mail.officeFeedEnabled",
         "dataType":  0,
         "booleanActions":  120,
-        "category": 103        
+        "category": "TableHeaders.settings"        
     },
     {
         "nameResourceKey":  "OutlookAppConfig.allowSmartReplyTitle",
@@ -226,7 +226,7 @@
         "entityKey":  "com.microsoft.outlook.Mail.SuggestedRepliesEnabled",
         "dataType":  0,
         "booleanActions":  120,
-        "category": 103
+        "category": "TableHeaders.settings"
     },
     {
         "nameResourceKey":  "OutlookAppConfig.allowUserChangeTitle",
@@ -234,7 +234,7 @@
         "entityKey":  "com.microsoft.outlook.Mail.SuggestedRepliesEnabled.UserChangeAllowed",
         "dataType":  0,
         "booleanActions":  109,
-        "category": 103,
+        "category": "TableHeaders.settings",
         "unconfiguredValue": true,
         "allowMissing": true,
         "Condition": {
@@ -252,7 +252,7 @@
         "entityKey":  "com.microsoft.outlook.Mail.ExternalRecipientsToolTipEnabled",
         "dataType":  0,
         "booleanActions":  120,
-        "category": 103
+        "category": "TableHeaders.settings"
     },
     {
         "nameResourceKey":  "OutlookAppConfig.allowDefaultAppSignatureTitle",
@@ -260,7 +260,7 @@
         "entityKey":  "com.microsoft.outlook.Mail.DefaultSignatureEnabled",
         "dataType":  0,
         "booleanActions":  120,
-        "category": 103
+        "category": "TableHeaders.settings"
     },
     {
         "nameResourceKey":  "OutlookAppConfig.blockExternalImagesTitle",
@@ -268,7 +268,7 @@
         "entityKey":  "com.microsoft.outlook.Mail.BlockExternalImagesEnabled",
         "dataType":  0,
         "booleanActions":  120,
-        "category": 103
+        "category": "TableHeaders.settings"
     },
     {
         "nameResourceKey":  "OutlookAppConfig.allowUserChangeTitle",
@@ -278,7 +278,7 @@
         "booleanActions":  109,
         "unconfiguredValue": true,
         "allowMissing": true,
-        "category": 103,
+        "category": "TableHeaders.settings",
         "Condition": {
             "Expressions": [
                 {
@@ -294,7 +294,7 @@
         "entityKey":  "com.microsoft.outlook.Mail.OrganizeByThreadEnabled",
         "dataType":  0,
         "booleanActions":  120,
-        "category": 103
+        "category": "TableHeaders.settings"
     },
     {
         "nameResourceKey":  "OutlookAppConfig.playMyEmailsTitle",
@@ -302,7 +302,7 @@
         "entityKey":  "com.microsoft.outlook.Mail.PlayMyEmailsEnabled",
         "dataType":  0,
         "booleanActions":  120,
-        "category": 103
+        "category": "TableHeaders.settings"
     },
     {
         "nameResourceKey":  "OutlookAppConfig.themesEnabledTitle",
@@ -310,7 +310,7 @@
         "entityKey":  "com.microsoft.outlook.Settings.ThemesEnabled",
         "dataType":  0,
         "booleanActions":  120,
-        "category": 103
+        "category": "TableHeaders.settings"
     },
     {
         "nameResourceKey":  "OutlookAppConfig.textPredictionsTitle",
@@ -318,7 +318,7 @@
         "entityKey":  "com.microsoft.outlook.Mail.TextPredictionsEnabled",
         "dataType":  0,
         "booleanActions":  120,
-        "category": 103
+        "category": "TableHeaders.settings"
     },
     {
         "nameResourceKey":  "OutlookAppConfig.allowUserChangeTitle",
@@ -328,7 +328,7 @@
         "booleanActions":  109,
         "unconfiguredValue": true,
         "allowMissing": true,
-        "category": 103,
+        "category": "TableHeaders.settings",
         "Condition": {
             "Expressions": [
                 {

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":  "",
@@ -836,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"
             },
@@ -892,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",
+                "entityKey":  "requirementRulesTranslated",
-                "dataType":  20,
+                "dataType":  21,
                 "booleanActions":  0,
                 "category": "Win32Requirements.selectorLabel"
             },
@@ -908,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",
+                "entityKey":  "detectionRulesTranslated",
-                "dataType":  20,
+                "dataType":  21,
                 "booleanActions":  0,
                 "category": "DetectionRules.selectorLabel",
                 "Condition": {                            

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

@@ -13,7 +13,7 @@
         "entityKey":  "showInstallationProgress",
         "dataType":  0,
         "booleanActions":  109,
-        "category":  103
+        "category":  "TableHeaders.settings"
     },
     {
         "nameResourceKey":  "EnrollmentStatusScreen.timeout",
@@ -21,7 +21,7 @@
         "entityKey":  "installProgressTimeoutInMinutes",
         "dataType":  14,
         "booleanActions":  0,
-        "category":  103
+        "category":  "TableHeaders.settings"
     },
     {
         "nameResourceKey":  "EnrollmentStatusScreen.customMessageToggle",
@@ -29,7 +29,7 @@
         "entityKey":  "showCustomErrorMessage",
         "dataType":  0,
         "booleanActions":  109,
-        "category":  103
+        "category":  "TableHeaders.settings"
     },
     {
         "nameResourceKey":  "EnrollmentStatusScreen.customMessageTextBox",
@@ -37,7 +37,7 @@
         "entityKey":  "customErrorMessage",
         "dataType":  20,
         "booleanActions":  0,
-        "category":  103
+        "category":  "TableHeaders.settings"
     },
     {
         "nameResourceKey":  "EnrollmentStatusScreen.collectLogToggle",
@@ -45,7 +45,7 @@
         "entityKey":  "allowLogCollectionOnInstallFailure",
         "dataType":  0,
         "booleanActions":  109,
-        "category":  103
+        "category":  "TableHeaders.settings"
     },
     {
         "nameResourceKey":  "EnrollmentStatusScreen.enableForAutopilotOnlyToggle",
@@ -53,7 +53,7 @@
         "entityKey":  "trackInstallProgressForAutopilotOnly",
         "dataType":  0,
         "booleanActions":  109,
-        "category":  103
+        "category":  "TableHeaders.settings"
     },
     {
         "nameResourceKey":  "EnrollmentStatusScreen.blockToggle",
@@ -61,7 +61,7 @@
         "entityKey":  "blockDeviceSetupRetryByUser",
         "dataType":  16,
         "booleanActions":  0,
-        "category":  103,
+        "category":  "TableHeaders.settings",
         "options":  [                                
             {
                 "nameResourceKey":  "SettingDetails.no",
@@ -77,7 +77,7 @@
                         "entityKey":  "allowDeviceResetOnInstallFailure",
                         "dataType":  0,
                         "booleanActions":  109,
-                        "category":  103
+                        "category":  "TableHeaders.settings"
                     },
                     {
                         "nameResourceKey":  "EnrollmentStatusScreen.allowToUseToggle",
@@ -85,7 +85,7 @@
                         "entityKey":  "allowDeviceUseOnInstallFailure",
                         "dataType":  0,
                         "booleanActions":  109,
-                        "category":  103
+                        "category":  "TableHeaders.settings"
                     },
                     {
                         "nameResourceKey":  "EnrollmentStatusScreen.Apps.useSelectedAppsToggleLabel",
@@ -93,7 +93,7 @@
                         "entityKey":  "waitForApps",
                         "dataType":  14,
                         "booleanActions":  0,
-                        "category":  103
+                        "category":  "TableHeaders.settings"
                     }
                 ]
             }

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

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

Documentation/ObjectInfo/#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/androiddefenderatp_complianceandroid.json

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

Documentation/ObjectInfo/androiddefenderatp_complianceandroiddeviceowner.json

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

Documentation/ObjectInfo/androiddefenderatp_complianceandroidforwork.json

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

Documentation/ObjectInfo/androiddeviceownerapplications_androiddeviceownergeneral.json

@@ -89,11 +89,24 @@
                                                                                                    "category":  2,
                                                                                                    "nameResourceKey":  "publicPlayStoreEnabledName",
                                                                                                    "descriptionResourceKey":  "publicPlayStoreEnabledDescription",
+                                                                                                   "childSettings":  [
+                                                                                                                         {
+                                                                                                                             "dataType":  10,
+                                                                                                                             "category":  2,
+                                                                                                                             "nameResourceKey":  "publicPlayStoreEnabledWarning",
                                                                                                                              "childSettings":  [
 
                                                                                                                                                ],
                                                                                                                              "options":  [
 
+                                                                                                                                         ],
+                                                                                                                             "booleanActions":  0,
+                                                                                                                             "policyType":  2,
+                                                                                                                             "enabled":  true
+                                                                                                                         }
+                                                                                                                     ],
+                                                                                                   "options":  [
+
                                                                                                                ],
                                                                                                    "entityKey":  "publicPlayStoreEnabled",
                                                                                                    "booleanActions":  0,

Documentation/ObjectInfo/androiddeviceownerpolicymessages_androiddeviceownergeneral.json

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

Documentation/ObjectInfo/applicationguard_windows10endpointprotection.json

@@ -2,7 +2,7 @@
     "applicationguard_windows10endpointprotection":  [
                                                          {
                                                              "dataType":  10,
-                                                             "category":  3,
+                                                             "category":  4,
                                                              "nameResourceKey":  "applicationGuardInstallationText",
                                                              "childSettings":  [
 
@@ -16,13 +16,13 @@
                                                          },
                                                          {
                                                              "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":  [
@@ -84,7 +84,7 @@
                                                                                                            "children":  [
                                                                                                                             {
                                                                                                                                 "dataType":  16,
-                                                                                                                                "category":  3,
+                                                                                                                                "category":  4,
                                                                                                                                 "nameResourceKey":  "applicationGuardClipboardContentName",
                                                                                                                                 "descriptionResourceKey":  "applicationGuardClipboardContentDescription",
                                                                                                                                 "childSettings":  [
@@ -128,7 +128,7 @@
                                                                                                            "children":  [
                                                                                                                             {
                                                                                                                                 "dataType":  16,
-                                                                                                                                "category":  3,
+                                                                                                                                "category":  4,
                                                                                                                                 "nameResourceKey":  "applicationGuardClipboardContentName",
                                                                                                                                 "descriptionResourceKey":  "applicationGuardClipboardContentDescription",
                                                                                                                                 "childSettings":  [
@@ -181,7 +181,7 @@
                                                                                    },
                                                                                    {
                                                                                        "dataType":  0,
-                                                                                       "category":  3,
+                                                                                       "category":  4,
                                                                                        "nameResourceKey":  "applicationGuardBlockNonEnterpriseContentName",
                                                                                        "descriptionResourceKey":  "applicationGuardBlockNonEnterpriseContentDescription",
                                                                                        "childSettings":  [
@@ -199,13 +199,13 @@
                                                                                    },
                                                                                    {
                                                                                        "dataType":  0,
-                                                                                       "category":  3,
+                                                                                       "category":  4,
                                                                                        "nameResourceKey":  "applicationGuardPrintFromVirtualBrowserName",
                                                                                        "descriptionResourceKey":  "applicationGuardPrintFromVirtualBrowserDescription",
                                                                                        "childSettings":  [
                                                                                                              {
                                                                                                                  "dataType":  13,
-                                                                                                                 "category":  3,
+                                                                                                                 "category":  4,
                                                                                                                  "nameResourceKey":  "applicationGuardAllowPrintToName",
                                                                                                                  "descriptionResourceKey":  "applicationGuardAllowPrintToDescription",
                                                                                                                  "emptyValueResourceKey":  "notConfigured",
@@ -252,7 +252,7 @@
                                                                                    },
                                                                                    {
                                                                                        "dataType":  0,
-                                                                                       "category":  3,
+                                                                                       "category":  4,
                                                                                        "nameResourceKey":  "applicationGuardAuditingName",
                                                                                        "descriptionResourceKey":  "applicationGuardAuditingDescription",
                                                                                        "childSettings":  [
@@ -270,7 +270,7 @@
                                                                                    },
                                                                                    {
                                                                                        "dataType":  0,
-                                                                                       "category":  3,
+                                                                                       "category":  4,
                                                                                        "nameResourceKey":  "applicationGuardAllowPersistenceName",
                                                                                        "descriptionResourceKey":  "applicationGuardAllowPersistenceDescription",
                                                                                        "childSettings":  [
@@ -288,7 +288,7 @@
                                                                                    },
                                                                                    {
                                                                                        "dataType":  0,
-                                                                                       "category":  3,
+                                                                                       "category":  4,
                                                                                        "nameResourceKey":  "applicationGuardAllowVirtualGPUName",
                                                                                        "descriptionResourceKey":  "applicationGuardAllowVirtualGPUDescription",
                                                                                        "childSettings":  [
@@ -306,7 +306,7 @@
                                                                                    },
                                                                                    {
                                                                                        "dataType":  0,
-                                                                                       "category":  3,
+                                                                                       "category":  4,
                                                                                        "nameResourceKey":  "applicationGuardAllowFileSaveOnHostName",
                                                                                        "descriptionResourceKey":  "applicationGuardAllowFileSaveOnHostDescription",
                                                                                        "childSettings":  [
@@ -335,13 +335,13 @@
                                                          },
                                                          {
                                                              "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":  [
@@ -403,7 +403,7 @@
                                                                                                            "children":  [
                                                                                                                             {
                                                                                                                                 "dataType":  16,
-                                                                                                                                "category":  3,
+                                                                                                                                "category":  4,
                                                                                                                                 "nameResourceKey":  "applicationGuardClipboardContentName",
                                                                                                                                 "descriptionResourceKey":  "applicationGuardClipboardContentDescription",
                                                                                                                                 "childSettings":  [
@@ -447,7 +447,7 @@
                                                                                                            "children":  [
                                                                                                                             {
                                                                                                                                 "dataType":  16,
-                                                                                                                                "category":  3,
+                                                                                                                                "category":  4,
                                                                                                                                 "nameResourceKey":  "applicationGuardClipboardContentName",
                                                                                                                                 "descriptionResourceKey":  "applicationGuardClipboardContentDescription",
                                                                                                                                 "childSettings":  [
@@ -500,7 +500,7 @@
                                                                                    },
                                                                                    {
                                                                                        "dataType":  0,
-                                                                                       "category":  3,
+                                                                                       "category":  4,
                                                                                        "nameResourceKey":  "applicationGuardBlockNonEnterpriseContentName",
                                                                                        "descriptionResourceKey":  "applicationGuardBlockNonEnterpriseContentDescription",
                                                                                        "childSettings":  [
@@ -518,13 +518,13 @@
                                                                                    },
                                                                                    {
                                                                                        "dataType":  0,
-                                                                                       "category":  3,
+                                                                                       "category":  4,
                                                                                        "nameResourceKey":  "applicationGuardPrintFromVirtualBrowserName",
                                                                                        "descriptionResourceKey":  "applicationGuardPrintFromVirtualBrowserDescription",
                                                                                        "childSettings":  [
                                                                                                              {
                                                                                                                  "dataType":  13,
-                                                                                                                 "category":  3,
+                                                                                                                 "category":  4,
                                                                                                                  "nameResourceKey":  "applicationGuardAllowPrintToName",
                                                                                                                  "descriptionResourceKey":  "applicationGuardAllowPrintToDescription",
                                                                                                                  "emptyValueResourceKey":  "notConfigured",
@@ -571,7 +571,7 @@
                                                                                    },
                                                                                    {
                                                                                        "dataType":  0,
-                                                                                       "category":  3,
+                                                                                       "category":  4,
                                                                                        "nameResourceKey":  "applicationGuardAuditingName",
                                                                                        "descriptionResourceKey":  "applicationGuardAuditingDescription",
                                                                                        "childSettings":  [
@@ -589,7 +589,7 @@
                                                                                    },
                                                                                    {
                                                                                        "dataType":  0,
-                                                                                       "category":  3,
+                                                                                       "category":  4,
                                                                                        "nameResourceKey":  "applicationGuardAllowPersistenceName",
                                                                                        "descriptionResourceKey":  "applicationGuardAllowPersistenceDescription",
                                                                                        "childSettings":  [
@@ -607,7 +607,7 @@
                                                                                    },
                                                                                    {
                                                                                        "dataType":  0,
-                                                                                       "category":  3,
+                                                                                       "category":  4,
                                                                                        "nameResourceKey":  "applicationGuardAllowVirtualGPUName",
                                                                                        "descriptionResourceKey":  "applicationGuardAllowVirtualGPUDescription",
                                                                                        "childSettings":  [
@@ -625,7 +625,7 @@
                                                                                    },
                                                                                    {
                                                                                        "dataType":  0,
-                                                                                       "category":  3,
+                                                                                       "category":  4,
                                                                                        "nameResourceKey":  "applicationGuardAllowFileSaveOnHostName",
                                                                                        "descriptionResourceKey":  "applicationGuardAllowFileSaveOnHostDescription",
                                                                                        "childSettings":  [

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

@@ -4,7 +4,7 @@
                                                    "isSettingDescription":  false,
                                                    "showAsSectionHeader":  false,
                                                    "dataType":  8,
-                                                   "category":  4,
+                                                   "category":  5,
                                                    "nameResourceKey":  "IosGeneralApplicationRestrictionsHeader",
                                                    "childSettings":  [
 
@@ -20,13 +20,13 @@
                                                    "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",
@@ -54,7 +54,7 @@
                                                                                                                        {
                                                                                                                            "metadata":  {
                                                                                                                                             "dataType":  20,
-                                                                                                                                            "category":  4,
+                                                                                                                                            "category":  5,
                                                                                                                                             "nameResourceKey":  "appBundleIdColumn",
                                                                                                                                             "descriptionResourceKey":  "empty",
                                                                                                                                             "emptyValueResourceKey":  "bundleIdExample",
@@ -73,7 +73,7 @@
                                                                                                                        {
                                                                                                                            "metadata":  {
                                                                                                                                             "dataType":  20,
-                                                                                                                                            "category":  4,
+                                                                                                                                            "category":  5,
                                                                                                                                             "nameResourceKey":  "appNameName",
                                                                                                                                             "descriptionResourceKey":  "empty",
                                                                                                                                             "childSettings":  [
@@ -91,7 +91,7 @@
                                                                                                                        {
                                                                                                                            "metadata":  {
                                                                                                                                             "dataType":  20,
-                                                                                                                                            "category":  4,
+                                                                                                                                            "category":  5,
                                                                                                                                             "nameResourceKey":  "appPublisherName",
                                                                                                                                             "descriptionResourceKey":  "empty",
                                                                                                                                             "childSettings":  [
@@ -108,7 +108,7 @@
                                                                                                                        }
                                                                                                                    ],
                                                                                                        "dataType":  21,
-                                                                                                       "category":  4,
+                                                                                                       "category":  5,
                                                                                                        "nameResourceKey":  "appListTableName",
                                                                                                        "descriptionResourceKey":  "iosAppUrlHelp",
                                                                                                        "childSettings":  [

Documentation/ObjectInfo/applicationrestrictions_macgeneral.json

@@ -3,13 +3,13 @@
                                                "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",
@@ -37,7 +37,7 @@
                                                                                                                    {
                                                                                                                        "metadata":  {
                                                                                                                                         "dataType":  20,
-                                                                                                                                        "category":  4,
+                                                                                                                                        "category":  5,
                                                                                                                                         "nameResourceKey":  "appNameName",
                                                                                                                                         "descriptionResourceKey":  "empty",
                                                                                                                                         "childSettings":  [
@@ -55,7 +55,7 @@
                                                                                                                    {
                                                                                                                        "metadata":  {
                                                                                                                                         "dataType":  20,
-                                                                                                                                        "category":  4,
+                                                                                                                                        "category":  5,
                                                                                                                                         "nameResourceKey":  "appPublisherName",
                                                                                                                                         "descriptionResourceKey":  "empty",
                                                                                                                                         "childSettings":  [
@@ -72,7 +72,7 @@
                                                                                                                    }
                                                                                                                ],
                                                                                                    "dataType":  21,
-                                                                                                   "category":  4,
+                                                                                                   "category":  5,
                                                                                                    "nameResourceKey":  "appListTableName",
                                                                                                    "descriptionResourceKey":  "",
                                                                                                    "childSettings":  [

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",
@@ -29,7 +29,7 @@
                                                                                                   {
                                                                                                       "metadata":  {
                                                                                                                        "dataType":  20,
-                                                                                                                       "category":  4,
+                                                                                                                       "category":  5,
                                                                                                                        "nameResourceKey":  "appNameName",
                                                                                                                        "descriptionResourceKey":  "forYourOwnReference",
                                                                                                                        "childSettings":  [
@@ -47,7 +47,7 @@
                                                                                                   {
                                                                                                       "metadata":  {
                                                                                                                        "dataType":  20,
-                                                                                                                       "category":  4,
+                                                                                                                       "category":  5,
                                                                                                                        "nameResourceKey":  "appPublisherName",
                                                                                                                        "descriptionResourceKey":  "forYourOwnReference",
                                                                                                                        "childSettings":  [
@@ -64,7 +64,7 @@
                                                                                                   }
                                                                                               ],
                                                                                   "dataType":  21,
-                                                                                  "category":  4,
+                                                                                  "category":  5,
                                                                                   "nameResourceKey":  "appListTableName",
                                                                                   "descriptionResourceKey":  "windowsAppUrlHelp",
                                                                                   "childSettings":  [

Documentation/ObjectInfo/applications_windows10general.json

@@ -2,7 +2,7 @@
     "applications_windows10general":  [
                                           {
                                               "dataType":  0,
-                                              "category":  6,
+                                              "category":  7,
                                               "nameResourceKey":  "blockAppStoreWindowsMobileOnlyName",
                                               "descriptionResourceKey":  "empty",
                                               "childSettings":  [
@@ -19,7 +19,7 @@
                                           },
                                           {
                                               "dataType":  0,
-                                              "category":  6,
+                                              "category":  7,
                                               "nameResourceKey":  "blockAppStoreAutoUpdate",
                                               "descriptionResourceKey":  "blockAppStoreAutoUpdateDescription",
                                               "childSettings":  [
@@ -36,7 +36,7 @@
                                           },
                                           {
                                               "dataType":  16,
-                                              "category":  6,
+                                              "category":  7,
                                               "nameResourceKey":  "allowAllTrustedAppsSideloading",
                                               "descriptionResourceKey":  "allowAllTrustedAppsSideloadingDescription",
                                               "childSettings":  [
@@ -68,7 +68,7 @@
                                           },
                                           {
                                               "dataType":  16,
-                                              "category":  6,
+                                              "category":  7,
                                               "nameResourceKey":  "developerUnlock",
                                               "descriptionResourceKey":  "developerUnlockDescription",
                                               "childSettings":  [
@@ -100,7 +100,7 @@
                                           },
                                           {
                                               "dataType":  0,
-                                              "category":  6,
+                                              "category":  7,
                                               "nameResourceKey":  "allowSharedUserAppData",
                                               "descriptionResourceKey":  "allowSharedUserAppDataDescription",
                                               "childSettings":  [
@@ -117,7 +117,7 @@
                                           },
                                           {
                                               "dataType":  0,
-                                              "category":  6,
+                                              "category":  7,
                                               "nameResourceKey":  "enableUsePrivateStoreOnly",
                                               "descriptionResourceKey":  "enableUsePrivateStoreOnlyDescription",
                                               "childSettings":  [
@@ -134,7 +134,7 @@
                                           },
                                           {
                                               "dataType":  0,
-                                              "category":  6,
+                                              "category":  7,
                                               "nameResourceKey":  "blockStoreOriginatedApps",
                                               "descriptionResourceKey":  "blockStoreOriginatedAppsDescription",
                                               "childSettings":  [
@@ -151,7 +151,7 @@
                                           },
                                           {
                                               "dataType":  0,
-                                              "category":  6,
+                                              "category":  7,
                                               "nameResourceKey":  "restrictAppDataToSystemVolume",
                                               "descriptionResourceKey":  "restrictAppDataToSystemVolumeDescription",
                                               "childSettings":  [
@@ -168,7 +168,7 @@
                                           },
                                           {
                                               "dataType":  0,
-                                              "category":  6,
+                                              "category":  7,
                                               "nameResourceKey":  "restrictAppInstallToSystemVolume",
                                               "descriptionResourceKey":  "restrictAppInstallToSystemVolumeDescription",
                                               "childSettings":  [
@@ -185,7 +185,7 @@
                                           },
                                           {
                                               "dataType":  0,
-                                              "category":  6,
+                                              "category":  7,
                                               "nameResourceKey":  "blockGameDvr",
                                               "descriptionResourceKey":  "blockGameDvrDescription",
                                               "childSettings":  [
@@ -202,7 +202,7 @@
                                           },
                                           {
                                               "dataType":  0,
-                                              "category":  6,
+                                              "category":  7,
                                               "nameResourceKey":  "enableAppInstallControlName",
                                               "descriptionResourceKey":  "enableAppInstallControlDescription",
                                               "childSettings":  [
@@ -219,7 +219,7 @@
                                           },
                                           {
                                               "dataType":  16,
-                                              "category":  6,
+                                              "category":  7,
                                               "nameResourceKey":  "smartScreenAppInstallControlName",
                                               "descriptionResourceKey":  "smartScreenAppInstallControlDescription",
                                               "childSettings":  [
@@ -260,7 +260,7 @@
                                           },
                                           {
                                               "dataType":  19,
-                                              "category":  6,
+                                              "category":  7,
                                               "nameResourceKey":  "appManagementMSIAllowUserControlOverInstallName",
                                               "descriptionResourceKey":  "appManagementMSIAllowUserControlOverInstallDesc",
                                               "childSettings":  [
@@ -287,7 +287,7 @@
                                           },
                                           {
                                               "dataType":  19,
-                                              "category":  6,
+                                              "category":  7,
                                               "nameResourceKey":  "appManagementMSIAlwaysInstallWithElevatedPrivilegesName",
                                               "descriptionResourceKey":  "appManagementMSIAlwaysInstallWithElevatedPrivilegesDesc",
                                               "childSettings":  [
@@ -314,7 +314,7 @@
                                           },
                                           {
                                               "dataType":  12,
-                                              "category":  6,
+                                              "category":  7,
                                               "nameResourceKey":  "appManagementPackageFamilyNamesToLaunchAfterLogOnName",
                                               "descriptionResourceKey":  "appManagementPackageFamilyNamesToLaunchAfterLogOnDescription",
                                               "emptyValueResourceKey":  "appManagementPackageFamilyNamesToLaunchAfterLogOnPlaceholder",

Documentation/ObjectInfo/applications_windowsphonegeneral.json

@@ -1,7 +1,7 @@
 {
     "applications_windowsphonegeneral":  {
                                              "dataType":  0,
-                                             "category":  6,
+                                             "category":  7,
                                              "nameResourceKey":  "blockApplicationStoreName",
                                              "descriptionResourceKey":  "empty",
                                              "childSettings":  [

Documentation/ObjectInfo/applicationsandgames_iosgeneral.json

@@ -4,18 +4,18 @@
                                                 "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":  [
@@ -42,7 +42,7 @@
                                                                       },
                                                                       {
                                                                           "dataType":  0,
-                                                                          "category":  7,
+                                                                          "category":  8,
                                                                           "nameResourceKey":  "forceAirDropToBeUnmanagedTargetName",
                                                                           "descriptionResourceKey":  "forceAirDropToBeUnmanagedTargetDescription",
                                                                           "childSettings":  [
@@ -59,7 +59,7 @@
                                                                       },
                                                                       {
                                                                           "dataType":  0,
-                                                                          "category":  7,
+                                                                          "category":  8,
                                                                           "nameResourceKey":  "blockUnmanagedDocumentsInManagedAppsName",
                                                                           "childSettings":  [
 
@@ -72,6 +72,23 @@
                                                                           "defaultValue":  false,
                                                                           "policyType":  46,
                                                                           "enabled":  true
+                                                                      },
+                                                                      {
+                                                                          "dataType":  0,
+                                                                          "category":  8,
+                                                                          "nameResourceKey":  "managedPasteboardRequiredName",
+                                                                          "descriptionResourceKey":  "managedPasteboardRequiredDescription",
+                                                                          "childSettings":  [
+
+                                                                                            ],
+                                                                          "options":  [
+
+                                                                                      ],
+                                                                          "entityKey":  "managedPasteboardRequired",
+                                                                          "booleanActions":  9,
+                                                                          "defaultValue":  false,
+                                                                          "policyType":  46,
+                                                                          "enabled":  true
                                                                       }
                                                                   ],
                                                 "options":  [
@@ -85,13 +102,13 @@
                                                 "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":  [
@@ -108,7 +125,7 @@
                                                                       },
                                                                       {
                                                                           "dataType":  0,
-                                                                          "category":  7,
+                                                                          "category":  8,
                                                                           "nameResourceKey":  "blockInAppPurchasesName",
                                                                           "childSettings":  [
 
@@ -124,7 +141,7 @@
                                                                       },
                                                                       {
                                                                           "dataType":  0,
-                                                                          "category":  7,
+                                                                          "category":  8,
                                                                           "nameResourceKey":  "blockIBooksStoreEroticaName",
                                                                           "descriptionResourceKey":  "blockIBooksStoreEroticaDescription",
                                                                           "childSettings":  [
@@ -141,7 +158,7 @@
                                                                       },
                                                                       {
                                                                           "dataType":  0,
-                                                                          "category":  7,
+                                                                          "category":  8,
                                                                           "nameResourceKey":  "allowManagedToWriteUnmanagedContactsName",
                                                                           "descriptionResourceKey":  "allowManagedToWriteUnmanagedContactsDescription",
                                                                           "childSettings":  [
@@ -158,7 +175,7 @@
                                                                       },
                                                                       {
                                                                           "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":  [
@@ -229,7 +246,7 @@
                                                                                                                                           },
                                                                                                                                           {
                                                                                                                                               "dataType":  16,
-                                                                                                                                              "category":  7,
+                                                                                                                                              "category":  8,
                                                                                                                                               "nameResourceKey":  "mediaContentRatingTVName",
                                                                                                                                               "descriptionResourceKey":  "mediaContentRatingTVDescription",
                                                                                                                                               "childSettings":  [
@@ -290,7 +307,7 @@
                                                                                                                                           }
                                                                                                                                       ],
                                                                                                                    "dataType":  6,
-                                                                                                                   "category":  7,
+                                                                                                                   "category":  8,
                                                                                                                    "nameResourceKey":  "mediaContentRatingAustraliaName",
                                                                                                                    "descriptionResourceKey":  "empty",
                                                                                                                    "childSettings":  [
@@ -306,7 +323,7 @@
                                                                                                                },
                                                                                                                {
                                                                                                                    "dataType":  16,
-                                                                                                                   "category":  7,
+                                                                                                                   "category":  8,
                                                                                                                    "nameResourceKey":  "mediaContentRatingAppsName",
                                                                                                                    "descriptionResourceKey":  "mediaContentRatingAppsDescription",
                                                                                                                    "childSettings":  [
@@ -362,7 +379,7 @@
                                                                                                                    "complexOptions":  [
                                                                                                                                           {
                                                                                                                                               "dataType":  16,
-                                                                                                                                              "category":  7,
+                                                                                                                                              "category":  8,
                                                                                                                                               "nameResourceKey":  "mediaContentRatingMoviesName",
                                                                                                                                               "descriptionResourceKey":  "mediaContentRatingMoviesDescription",
                                                                                                                                               "childSettings":  [
@@ -413,7 +430,7 @@
                                                                                                                                           },
                                                                                                                                           {
                                                                                                                                               "dataType":  16,
-                                                                                                                                              "category":  7,
+                                                                                                                                              "category":  8,
                                                                                                                                               "nameResourceKey":  "mediaContentRatingTVName",
                                                                                                                                               "descriptionResourceKey":  "mediaContentRatingTVDescription",
                                                                                                                                               "childSettings":  [
@@ -469,7 +486,7 @@
                                                                                                                                           }
                                                                                                                                       ],
                                                                                                                    "dataType":  6,
-                                                                                                                   "category":  7,
+                                                                                                                   "category":  8,
                                                                                                                    "nameResourceKey":  "mediaContentRatingCanadaName",
                                                                                                                    "descriptionResourceKey":  "empty",
                                                                                                                    "childSettings":  [
@@ -485,7 +502,7 @@
                                                                                                                },
                                                                                                                {
                                                                                                                    "dataType":  16,
-                                                                                                                   "category":  7,
+                                                                                                                   "category":  8,
                                                                                                                    "nameResourceKey":  "mediaContentRatingAppsName",
                                                                                                                    "descriptionResourceKey":  "mediaContentRatingAppsDescription",
                                                                                                                    "childSettings":  [
@@ -541,7 +558,7 @@
                                                                                                                    "complexOptions":  [
                                                                                                                                           {
                                                                                                                                               "dataType":  16,
-                                                                                                                                              "category":  7,
+                                                                                                                                              "category":  8,
                                                                                                                                               "nameResourceKey":  "mediaContentRatingMoviesName",
                                                                                                                                               "descriptionResourceKey":  "mediaContentRatingMoviesDescription",
                                                                                                                                               "childSettings":  [
@@ -587,7 +604,7 @@
                                                                                                                                           },
                                                                                                                                           {
                                                                                                                                               "dataType":  16,
-                                                                                                                                              "category":  7,
+                                                                                                                                              "category":  8,
                                                                                                                                               "nameResourceKey":  "mediaContentRatingTVName",
                                                                                                                                               "descriptionResourceKey":  "mediaContentRatingTVDescription",
                                                                                                                                               "childSettings":  [
@@ -633,7 +650,7 @@
                                                                                                                                           }
                                                                                                                                       ],
                                                                                                                    "dataType":  6,
-                                                                                                                   "category":  7,
+                                                                                                                   "category":  8,
                                                                                                                    "nameResourceKey":  "mediaContentRatingFranceName",
                                                                                                                    "descriptionResourceKey":  "empty",
                                                                                                                    "childSettings":  [
@@ -649,7 +666,7 @@
                                                                                                                },
                                                                                                                {
                                                                                                                    "dataType":  16,
-                                                                                                                   "category":  7,
+                                                                                                                   "category":  8,
                                                                                                                    "nameResourceKey":  "mediaContentRatingAppsName",
                                                                                                                    "descriptionResourceKey":  "mediaContentRatingAppsDescription",
                                                                                                                    "childSettings":  [
@@ -705,7 +722,7 @@
                                                                                                                    "complexOptions":  [
                                                                                                                                           {
                                                                                                                                               "dataType":  16,
-                                                                                                                                              "category":  7,
+                                                                                                                                              "category":  8,
                                                                                                                                               "nameResourceKey":  "mediaContentRatingMoviesName",
                                                                                                                                               "descriptionResourceKey":  "mediaContentRatingMoviesDescription",
                                                                                                                                               "childSettings":  [
@@ -756,7 +773,7 @@
                                                                                                                                           },
                                                                                                                                           {
                                                                                                                                               "dataType":  16,
-                                                                                                                                              "category":  7,
+                                                                                                                                              "category":  8,
                                                                                                                                               "nameResourceKey":  "mediaContentRatingTVName",
                                                                                                                                               "descriptionResourceKey":  "mediaContentRatingTVDescription",
                                                                                                                                               "childSettings":  [
@@ -807,7 +824,7 @@
                                                                                                                                           }
                                                                                                                                       ],
                                                                                                                    "dataType":  6,
-                                                                                                                   "category":  7,
+                                                                                                                   "category":  8,
                                                                                                                    "nameResourceKey":  "mediaContentRatingGermanyName",
                                                                                                                    "descriptionResourceKey":  "empty",
                                                                                                                    "childSettings":  [
@@ -823,7 +840,7 @@
                                                                                                                },
                                                                                                                {
                                                                                                                    "dataType":  16,
-                                                                                                                   "category":  7,
+                                                                                                                   "category":  8,
                                                                                                                    "nameResourceKey":  "mediaContentRatingAppsName",
                                                                                                                    "descriptionResourceKey":  "mediaContentRatingAppsDescription",
                                                                                                                    "childSettings":  [
@@ -879,7 +896,7 @@
                                                                                                                    "complexOptions":  [
                                                                                                                                           {
                                                                                                                                               "dataType":  16,
-                                                                                                                                              "category":  7,
+                                                                                                                                              "category":  8,
                                                                                                                                               "nameResourceKey":  "mediaContentRatingMoviesName",
                                                                                                                                               "descriptionResourceKey":  "mediaContentRatingMoviesDescription",
                                                                                                                                               "childSettings":  [
@@ -935,7 +952,7 @@
                                                                                                                                           },
                                                                                                                                           {
                                                                                                                                               "dataType":  16,
-                                                                                                                                              "category":  7,
+                                                                                                                                              "category":  8,
                                                                                                                                               "nameResourceKey":  "mediaContentRatingTVName",
                                                                                                                                               "descriptionResourceKey":  "mediaContentRatingTVDescription",
                                                                                                                                               "childSettings":  [
@@ -986,7 +1003,7 @@
                                                                                                                                           }
                                                                                                                                       ],
                                                                                                                    "dataType":  6,
-                                                                                                                   "category":  7,
+                                                                                                                   "category":  8,
                                                                                                                    "nameResourceKey":  "mediaContentRatingIrelandName",
                                                                                                                    "descriptionResourceKey":  "empty",
                                                                                                                    "childSettings":  [
@@ -1002,7 +1019,7 @@
                                                                                                                },
                                                                                                                {
                                                                                                                    "dataType":  16,
-                                                                                                                   "category":  7,
+                                                                                                                   "category":  8,
                                                                                                                    "nameResourceKey":  "mediaContentRatingAppsName",
                                                                                                                    "descriptionResourceKey":  "mediaContentRatingAppsDescription",
                                                                                                                    "childSettings":  [
@@ -1058,7 +1075,7 @@
                                                                                                                    "complexOptions":  [
                                                                                                                                           {
                                                                                                                                               "dataType":  16,
-                                                                                                                                              "category":  7,
+                                                                                                                                              "category":  8,
                                                                                                                                               "nameResourceKey":  "mediaContentRatingMoviesName",
                                                                                                                                               "descriptionResourceKey":  "mediaContentRatingMoviesDescription",
                                                                                                                                               "childSettings":  [
@@ -1104,7 +1121,7 @@
                                                                                                                                           },
                                                                                                                                           {
                                                                                                                                               "dataType":  16,
-                                                                                                                                              "category":  7,
+                                                                                                                                              "category":  8,
                                                                                                                                               "nameResourceKey":  "mediaContentRatingTVName",
                                                                                                                                               "descriptionResourceKey":  "mediaContentRatingTVDescription",
                                                                                                                                               "childSettings":  [
@@ -1135,7 +1152,7 @@
                                                                                                                                           }
                                                                                                                                       ],
                                                                                                                    "dataType":  6,
-                                                                                                                   "category":  7,
+                                                                                                                   "category":  8,
                                                                                                                    "nameResourceKey":  "mediaContentRatingJapanName",
                                                                                                                    "descriptionResourceKey":  "empty",
                                                                                                                    "childSettings":  [
@@ -1151,7 +1168,7 @@
                                                                                                                },
                                                                                                                {
                                                                                                                    "dataType":  16,
-                                                                                                                   "category":  7,
+                                                                                                                   "category":  8,
                                                                                                                    "nameResourceKey":  "mediaContentRatingAppsName",
                                                                                                                    "descriptionResourceKey":  "mediaContentRatingAppsDescription",
                                                                                                                    "childSettings":  [
@@ -1207,7 +1224,7 @@
                                                                                                                    "complexOptions":  [
                                                                                                                                           {
                                                                                                                                               "dataType":  16,
-                                                                                                                                              "category":  7,
+                                                                                                                                              "category":  8,
                                                                                                                                               "nameResourceKey":  "mediaContentRatingMoviesName",
                                                                                                                                               "descriptionResourceKey":  "mediaContentRatingMoviesDescription",
                                                                                                                                               "childSettings":  [
@@ -1278,7 +1295,7 @@
                                                                                                                                           },
                                                                                                                                           {
                                                                                                                                               "dataType":  16,
-                                                                                                                                              "category":  7,
+                                                                                                                                              "category":  8,
                                                                                                                                               "nameResourceKey":  "mediaContentRatingTVName",
                                                                                                                                               "descriptionResourceKey":  "mediaContentRatingTVDescription",
                                                                                                                                               "childSettings":  [
@@ -1319,7 +1336,7 @@
                                                                                                                                           }
                                                                                                                                       ],
                                                                                                                    "dataType":  6,
-                                                                                                                   "category":  7,
+                                                                                                                   "category":  8,
                                                                                                                    "nameResourceKey":  "mediaContentRatingNewZealandName",
                                                                                                                    "descriptionResourceKey":  "empty",
                                                                                                                    "childSettings":  [
@@ -1335,7 +1352,7 @@
                                                                                                                },
                                                                                                                {
                                                                                                                    "dataType":  16,
-                                                                                                                   "category":  7,
+                                                                                                                   "category":  8,
                                                                                                                    "nameResourceKey":  "mediaContentRatingAppsName",
                                                                                                                    "descriptionResourceKey":  "mediaContentRatingAppsDescription",
                                                                                                                    "childSettings":  [
@@ -1391,7 +1408,7 @@
                                                                                                                    "complexOptions":  [
                                                                                                                                           {
                                                                                                                                               "dataType":  16,
-                                                                                                                                              "category":  7,
+                                                                                                                                              "category":  8,
                                                                                                                                               "nameResourceKey":  "mediaContentRatingMoviesName",
                                                                                                                                               "descriptionResourceKey":  "mediaContentRatingMoviesDescription",
                                                                                                                                               "childSettings":  [
@@ -1452,7 +1469,7 @@
                                                                                                                                           },
                                                                                                                                           {
                                                                                                                                               "dataType":  16,
-                                                                                                                                              "category":  7,
+                                                                                                                                              "category":  8,
                                                                                                                                               "nameResourceKey":  "mediaContentRatingTVName",
                                                                                                                                               "descriptionResourceKey":  "mediaContentRatingTVDescription",
                                                                                                                                               "childSettings":  [
@@ -1483,7 +1500,7 @@
                                                                                                                                           }
                                                                                                                                       ],
                                                                                                                    "dataType":  6,
-                                                                                                                   "category":  7,
+                                                                                                                   "category":  8,
                                                                                                                    "nameResourceKey":  "mediaContentRatingUnitedKingdomName",
                                                                                                                    "descriptionResourceKey":  "empty",
                                                                                                                    "childSettings":  [
@@ -1499,7 +1516,7 @@
                                                                                                                },
                                                                                                                {
                                                                                                                    "dataType":  16,
-                                                                                                                   "category":  7,
+                                                                                                                   "category":  8,
                                                                                                                    "nameResourceKey":  "mediaContentRatingAppsName",
                                                                                                                    "descriptionResourceKey":  "mediaContentRatingAppsDescription",
                                                                                                                    "childSettings":  [
@@ -1555,7 +1572,7 @@
                                                                                                                    "complexOptions":  [
                                                                                                                                           {
                                                                                                                                               "dataType":  16,
-                                                                                                                                              "category":  7,
+                                                                                                                                              "category":  8,
                                                                                                                                               "nameResourceKey":  "mediaContentRatingMoviesName",
                                                                                                                                               "descriptionResourceKey":  "mediaContentRatingMoviesDescription",
                                                                                                                                               "childSettings":  [
@@ -1606,7 +1623,7 @@
                                                                                                                                           },
                                                                                                                                           {
                                                                                                                                               "dataType":  16,
-                                                                                                                                              "category":  7,
+                                                                                                                                              "category":  8,
                                                                                                                                               "nameResourceKey":  "mediaContentRatingTVName",
                                                                                                                                               "descriptionResourceKey":  "mediaContentRatingTVDescription",
                                                                                                                                               "childSettings":  [
@@ -1662,7 +1679,7 @@
                                                                                                                                           }
                                                                                                                                       ],
                                                                                                                    "dataType":  6,
-                                                                                                                   "category":  7,
+                                                                                                                   "category":  8,
                                                                                                                    "nameResourceKey":  "mediaContentRatingUnitedStatesName",
                                                                                                                    "descriptionResourceKey":  "empty",
                                                                                                                    "childSettings":  [
@@ -1678,7 +1695,7 @@
                                                                                                                },
                                                                                                                {
                                                                                                                    "dataType":  16,
-                                                                                                                   "category":  7,
+                                                                                                                   "category":  8,
                                                                                                                    "nameResourceKey":  "mediaContentRatingAppsName",
                                                                                                                    "descriptionResourceKey":  "mediaContentRatingAppsDescription",
                                                                                                                    "childSettings":  [
@@ -1746,19 +1763,19 @@
                                                 "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":  [
@@ -1775,7 +1792,7 @@
                                                                                                 },
                                                                                                 {
                                                                                                     "dataType":  0,
-                                                                                                    "category":  7,
+                                                                                                    "category":  8,
                                                                                                     "nameResourceKey":  "blockAppStoreAutomaticDownloadsName",
                                                                                                     "descriptionResourceKey":  "blockAppStoreAutomaticDownloadsDescription",
                                                                                                     "childSettings":  [
@@ -1802,7 +1819,7 @@
                                                                       },
                                                                       {
                                                                           "dataType":  0,
-                                                                          "category":  7,
+                                                                          "category":  8,
                                                                           "nameResourceKey":  "blockAdultContentInItunesName",
                                                                           "descriptionResourceKey":  "blockAdultContentInItunesDescription",
                                                                           "childSettings":  [
@@ -1819,7 +1836,7 @@
                                                                       },
                                                                       {
                                                                           "dataType":  0,
-                                                                          "category":  7,
+                                                                          "category":  8,
                                                                           "nameResourceKey":  "blockGameCenterFriendsName",
                                                                           "descriptionResourceKey":  "blockGameCenterFriendsDescription",
                                                                           "childSettings":  [
@@ -1836,7 +1853,7 @@
                                                                       },
                                                                       {
                                                                           "dataType":  0,
-                                                                          "category":  7,
+                                                                          "category":  8,
                                                                           "nameResourceKey":  "blockGameCenterName",
                                                                           "childSettings":  [
 
@@ -1852,7 +1869,7 @@
                                                                       },
                                                                       {
                                                                           "dataType":  0,
-                                                                          "category":  7,
+                                                                          "category":  8,
                                                                           "nameResourceKey":  "blockMultiplayerGamingName",
                                                                           "descriptionResourceKey":  "blockMultiplayerGamingDescription",
                                                                           "childSettings":  [
@@ -1869,7 +1886,7 @@
                                                                       },
                                                                       {
                                                                           "dataType":  0,
-                                                                          "category":  7,
+                                                                          "category":  8,
                                                                           "nameResourceKey":  "blockFilesNetworkDriveAccessName",
                                                                           "descriptionResourceKey":  "blockFilesNetworkDriveAccessDescription",
                                                                           "childSettings":  [
@@ -1883,23 +1900,6 @@
                                                                           "defaultValue":  false,
                                                                           "policyType":  46,
                                                                           "enabled":  true
-                                                                      },
-                                                                      {
-                                                                          "dataType":  0,
-                                                                          "category":  7,
-                                                                          "nameResourceKey":  "managedPasteboardRequiredName",
-                                                                          "descriptionResourceKey":  "managedPasteboardRequiredDescription",
-                                                                          "childSettings":  [
-
-                                                                                            ],
-                                                                          "options":  [
-
-                                                                                      ],
-                                                                          "entityKey":  "managedPasteboardRequired",
-                                                                          "booleanActions":  9,
-                                                                          "defaultValue":  false,
-                                                                          "policyType":  46,
-                                                                          "enabled":  true
                                                                       }
                                                                   ],
                                                 "options":  [

Documentation/ObjectInfo/applicationsandgames_macgeneral.json

@@ -3,13 +3,13 @@
                                             "isSettingDescription":  false,
                                             "showAsSectionHeader":  true,
                                             "dataType":  8,
-                                            "category":  7,
+                                            "category":  8,
                                             "nameResourceKey":  "automatedDeviceEnrollmentHeaderNameMac",
                                             "descriptionResourceKey":  "automatedDeviceEnrollmentHeaderDescriptionMac",
                                             "childSettings":  [
                                                                   {
                                                                       "dataType":  0,
-                                                                      "category":  7,
+                                                                      "category":  8,
                                                                       "nameResourceKey":  "addingGameCenterFriendsBlockedMacName",
                                                                       "descriptionResourceKey":  "addingGameCenterFriendsBlockedMacDescription",
                                                                       "childSettings":  [
@@ -26,7 +26,7 @@
                                                                   },
                                                                   {
                                                                       "dataType":  0,
-                                                                      "category":  7,
+                                                                      "category":  8,
                                                                       "nameResourceKey":  "gameCenterBlockedMacName",
                                                                       "descriptionResourceKey":  "gameCenterBlockedMacDescription",
                                                                       "childSettings":  [
@@ -43,7 +43,7 @@
                                                                   },
                                                                   {
                                                                       "dataType":  0,
-                                                                      "category":  7,
+                                                                      "category":  8,
                                                                       "nameResourceKey":  "multiplayerGamingBlockedMacName",
                                                                       "descriptionResourceKey":  "multiplayerGamingBlockedMacDescription",
                                                                       "childSettings":  [

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

@@ -4,7 +4,7 @@
                                                  "isSettingDescription":  false,
                                                  "showAsSectionHeader":  false,
                                                  "dataType":  8,
-                                                 "category":  5,
+                                                 "category":  6,
                                                  "nameResourceKey":  "IosGeneralApplicationVisibilityHeader",
                                                  "childSettings":  [
 
@@ -20,13 +20,13 @@
                                                  "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",
@@ -54,7 +54,7 @@
                                                                                                                      {
                                                                                                                          "metadata":  {
                                                                                                                                           "dataType":  20,
-                                                                                                                                          "category":  5,
+                                                                                                                                          "category":  6,
                                                                                                                                           "nameResourceKey":  "appBundleIdColumn",
                                                                                                                                           "descriptionResourceKey":  "empty",
                                                                                                                                           "emptyValueResourceKey":  "bundleIdExample",
@@ -73,7 +73,7 @@
                                                                                                                      {
                                                                                                                          "metadata":  {
                                                                                                                                           "dataType":  20,
-                                                                                                                                          "category":  5,
+                                                                                                                                          "category":  6,
                                                                                                                                           "nameResourceKey":  "appNameName",
                                                                                                                                           "descriptionResourceKey":  "empty",
                                                                                                                                           "childSettings":  [
@@ -91,7 +91,7 @@
                                                                                                                      {
                                                                                                                          "metadata":  {
                                                                                                                                           "dataType":  20,
-                                                                                                                                          "category":  5,
+                                                                                                                                          "category":  6,
                                                                                                                                           "nameResourceKey":  "appPublisherName",
                                                                                                                                           "descriptionResourceKey":  "empty",
                                                                                                                                           "childSettings":  [
@@ -108,7 +108,7 @@
                                                                                                                      }
                                                                                                                  ],
                                                                                                      "dataType":  21,
-                                                                                                     "category":  5,
+                                                                                                     "category":  6,
                                                                                                      "nameResourceKey":  "appListTableName",
                                                                                                      "descriptionResourceKey":  "iosAppUrlHelp",
                                                                                                      "childSettings":  [

Documentation/ObjectInfo/appmanagement_androidgeneral.json

@@ -4,7 +4,7 @@
                                              "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

@@ -2,7 +2,7 @@
     "appsandexperience_windows10teamgeneral":  [
                                                    {
                                                        "dataType":  0,
-                                                       "category":  10,
+                                                       "category":  11,
                                                        "nameResourceKey":  "wakeScreenWhenSomeoneInRoomName",
                                                        "descriptionResourceKey":  "empty",
                                                        "childSettings":  [
@@ -19,7 +19,7 @@
                                                    },
                                                    {
                                                        "dataType":  16,
-                                                       "category":  10,
+                                                       "category":  11,
                                                        "nameResourceKey":  "meetingInformationDisplayedOnWelcomeScreenName",
                                                        "descriptionResourceKey":  "empty",
                                                        "childSettings":  [
@@ -51,7 +51,7 @@
                                                    },
                                                    {
                                                        "dataType":  20,
-                                                       "category":  10,
+                                                       "category":  11,
                                                        "nameResourceKey":  "lockScreenBackgroundImageURLName",
                                                        "descriptionResourceKey":  "lockScreenBackgroundImageURLDescription",
                                                        "emptyValueResourceKey":  "lockScreenBackgroundImageURLExample",
@@ -68,7 +68,7 @@
                                                    },
                                                    {
                                                        "dataType":  0,
-                                                       "category":  10,
+                                                       "category":  11,
                                                        "nameResourceKey":  "connectAppBlockAutoLaunchName",
                                                        "descriptionResourceKey":  "connectAppBlockAutoLaunchDescription",
                                                        "childSettings":  [
@@ -85,7 +85,7 @@
                                                    },
                                                    {
                                                        "dataType":  0,
-                                                       "category":  10,
+                                                       "category":  11,
                                                        "nameResourceKey":  "settingsBlockSigninSuggestionsName",
                                                        "descriptionResourceKey":  "settingsBlockSigninSuggestionsDescription",
                                                        "childSettings":  [
@@ -102,7 +102,7 @@
                                                    },
                                                    {
                                                        "dataType":  0,
-                                                       "category":  10,
+                                                       "category":  11,
                                                        "nameResourceKey":  "settingsBlockMyMeetingsAndFilesName",
                                                        "descriptionResourceKey":  "settingsBlockMyMeetingsAndFilesDescription",
                                                        "childSettings":  [

Documentation/ObjectInfo/associateddomains_macdevicefeatures.json

@@ -4,7 +4,7 @@
                                                     "isSettingDescription":  false,
                                                     "showAsSectionHeader":  false,
                                                     "dataType":  8,
-                                                    "category":  11,
+                                                    "category":  12,
                                                     "nameResourceKey":  "MacDeviceFeaturesAssociatedDomainsHeader",
                                                     "childSettings":  [
 
@@ -20,7 +20,7 @@
                                                     "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",
@@ -51,7 +51,7 @@
                                                                                                                                    {
                                                                                                                                        "metadata":  {
                                                                                                                                                         "dataType":  20,
-                                                                                                                                                        "category":  11,
+                                                                                                                                                        "category":  12,
                                                                                                                                                         "nameResourceKey":  "associatedDomainsDomainName",
                                                                                                                                                         "emptyValueResourceKey":  "associatedDomainsDomainExample",
                                                                                                                                                         "childSettings":  [
@@ -68,7 +68,7 @@
                                                                                                                                    }
                                                                                                                                ],
                                                                                                                    "dataType":  21,
-                                                                                                                   "category":  11,
+                                                                                                                   "category":  12,
                                                                                                                    "nameResourceKey":  "associatedDomainsDomainsListName",
                                                                                                                    "descriptionResourceKey":  "associatedDomainsDomainsListDescription",
                                                                                                                    "childSettings":  [
@@ -86,7 +86,7 @@
                                                                                               {
                                                                                                   "metadata":  {
                                                                                                                    "dataType":  0,
-                                                                                                                   "category":  11,
+                                                                                                                   "category":  12,
                                                                                                                    "nameResourceKey":  "associatedDomainsEnableDirectDownloadsName",
                                                                                                                    "descriptionResourceKey":  "associatedDomainsEnableDirectDownloadsDescription",
                                                                                                                    "childSettings":  [
@@ -104,7 +104,7 @@
                                                                                               }
                                                                                           ],
                                                                               "dataType":  21,
-                                                                              "category":  11,
+                                                                              "category":  12,
                                                                               "nameResourceKey":  "associatedDomainsTableName",
                                                                               "descriptionResourceKey":  "associatedDomainsTableDescription",
                                                                               "childSettings":  [

Documentation/ObjectInfo/autonomoussingleappmode_iosgeneral.json

@@ -4,7 +4,7 @@
                                                    "isSettingDescription":  false,
                                                    "showAsSectionHeader":  false,
                                                    "dataType":  8,
-                                                   "category":  12,
+                                                   "category":  13,
                                                    "nameResourceKey":  "IosGeneralAutonomousSingleAppModeHeader",
                                                    "childSettings":  [
 
@@ -20,7 +20,7 @@
                                                    "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":  [
@@ -47,7 +47,7 @@
                                                                                              {
                                                                                                  "metadata":  {
                                                                                                                   "dataType":  20,
-                                                                                                                  "category":  12,
+                                                                                                                  "category":  13,
                                                                                                                   "nameResourceKey":  "singleAppModeBundleIdsName",
                                                                                                                   "descriptionResourceKey":  "singleAppModeBundleIdsDescription",
                                                                                                                   "childSettings":  [
@@ -64,7 +64,7 @@
                                                                                              }
                                                                                          ],
                                                                              "dataType":  21,
-                                                                             "category":  12,
+                                                                             "category":  13,
                                                                              "nameResourceKey":  "Empty",
                                                                              "descriptionResourceKey":  "Empty",
                                                                              "childSettings":  [

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":  [
@@ -23,7 +23,7 @@
                                                                                 },
                                                                                 {
                                                                                     "dataType":  20,
-                                                                                    "category":  13,
+                                                                                    "category":  14,
                                                                                     "nameResourceKey":  "workspaceKeyName",
                                                                                     "descriptionResourceKey":  "empty",
                                                                                     "childSettings":  [

Documentation/ObjectInfo/bitlocker_windows10endpointprotection.json

@@ -4,7 +4,7 @@
                                                       "isSettingDescription":  false,
                                                       "showAsSectionHeader":  false,
                                                       "dataType":  8,
-                                                      "category":  14,
+                                                      "category":  15,
                                                       "nameResourceKey":  "bitLockerWindowsSettingsName",
                                                       "descriptionResourceKey":  "bitLockerWindowsSettingsDescription",
                                                       "childSettings":  [
@@ -19,7 +19,7 @@
                                                   },
                                                   {
                                                       "dataType":  0,
-                                                      "category":  14,
+                                                      "category":  15,
                                                       "nameResourceKey":  "bitLockerEncryptDeviceName",
                                                       "descriptionResourceKey":  "bitLockerEncryptDeviceDescription",
                                                       "childSettings":  [
@@ -37,7 +37,7 @@
                                                   },
                                                   {
                                                       "dataType":  0,
-                                                      "category":  14,
+                                                      "category":  15,
                                                       "nameResourceKey":  "bitLockerEnableStorageCardEncryptionOnMobileName",
                                                       "descriptionResourceKey":  "bitLockerEnableStorageCardEncryptionOnMobileDescription",
                                                       "childSettings":  [
@@ -57,7 +57,7 @@
                                                       "isSettingDescription":  false,
                                                       "showAsSectionHeader":  false,
                                                       "dataType":  8,
-                                                      "category":  14,
+                                                      "category":  15,
                                                       "nameResourceKey":  "bitLockerBaseSettingsName",
                                                       "descriptionResourceKey":  "bitLockerBaseSettingsDescription",
                                                       "childSettings":  [
@@ -72,13 +72,13 @@
                                                   },
                                                   {
                                                       "dataType":  0,
-                                                      "category":  14,
+                                                      "category":  15,
                                                       "nameResourceKey":  "bitLockerDisableWarningForOtherDiskEncryptionName",
                                                       "descriptionResourceKey":  "bitLockerDisableWarningForOtherDiskEncryptionDescription",
                                                       "childSettings":  [
                                                                             {
                                                                                 "dataType":  0,
-                                                                                "category":  14,
+                                                                                "category":  15,
                                                                                 "nameResourceKey":  "BitLockerAllowStdUsersEncryptAADJoinName",
                                                                                 "descriptionResourceKey":  "BitLockerAllowStdUsersEncryptAADJoinDescription",
                                                                                 "childSettings":  [
@@ -116,13 +116,13 @@
                                                   },
                                                   {
                                                       "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":  [
 
@@ -156,7 +156,7 @@
                                                                                                     "children":  [
                                                                                                                      {
                                                                                                                          "dataType":  10,
-                                                                                                                         "category":  14,
+                                                                                                                         "category":  15,
                                                                                                                          "nameResourceKey":  "bitlockerWarningInfoBox",
                                                                                                                          "childSettings":  [
 
@@ -182,7 +182,7 @@
                                                                                                     "children":  [
                                                                                                                      {
                                                                                                                          "dataType":  10,
-                                                                                                                         "category":  14,
+                                                                                                                         "category":  15,
                                                                                                                          "nameResourceKey":  "bitlockerWarningInfoBox",
                                                                                                                          "childSettings":  [
 
@@ -207,7 +207,7 @@
                                                                             },
                                                                             {
                                                                                 "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":  [
 
@@ -241,7 +241,7 @@
                                                                                                     "children":  [
                                                                                                                      {
                                                                                                                          "dataType":  10,
-                                                                                                                         "category":  14,
+                                                                                                                         "category":  15,
                                                                                                                          "nameResourceKey":  "bitlockerWarningInfoBox",
                                                                                                                          "childSettings":  [
 
@@ -267,7 +267,7 @@
                                                                                                     "children":  [
                                                                                                                      {
                                                                                                                          "dataType":  10,
-                                                                                                                         "category":  14,
+                                                                                                                         "category":  15,
                                                                                                                          "nameResourceKey":  "bitlockerWarningInfoBox",
                                                                                                                          "childSettings":  [
 
@@ -292,7 +292,7 @@
                                                                             },
                                                                             {
                                                                                 "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":  [
 
@@ -331,7 +331,7 @@
                                                                                                     "children":  [
                                                                                                                      {
                                                                                                                          "dataType":  10,
-                                                                                                                         "category":  14,
+                                                                                                                         "category":  15,
                                                                                                                          "nameResourceKey":  "bitlockerWarningInfoBox",
                                                                                                                          "childSettings":  [
 
@@ -352,7 +352,7 @@
                                                                                                     "children":  [
                                                                                                                      {
                                                                                                                          "dataType":  10,
-                                                                                                                         "category":  14,
+                                                                                                                         "category":  15,
                                                                                                                          "nameResourceKey":  "bitlockerWarningInfoBox",
                                                                                                                          "childSettings":  [
 
@@ -390,7 +390,7 @@
                                                       "isSettingDescription":  false,
                                                       "showAsSectionHeader":  false,
                                                       "dataType":  8,
-                                                      "category":  14,
+                                                      "category":  15,
                                                       "nameResourceKey":  "bitLockerSystemDriveSettingsName",
                                                       "descriptionResourceKey":  "bitLockerSystemDriveSettingsDescription",
                                                       "childSettings":  [
@@ -405,13 +405,13 @@
                                                   },
                                                   {
                                                       "dataType":  0,
-                                                      "category":  14,
+                                                      "category":  15,
                                                       "nameResourceKey":  "bitLockerSystemDriveStartupAuthenticationRequiredName",
                                                       "descriptionResourceKey":  "bitLockerSystemDriveStartupAuthenticationRequiredDescription",
                                                       "childSettings":  [
                                                                             {
                                                                                 "dataType":  0,
-                                                                                "category":  14,
+                                                                                "category":  15,
                                                                                 "nameResourceKey":  "bitLockerSystemDriveStartupAuthenticationBlockWithoutTpmChipName",
                                                                                 "descriptionResourceKey":  "bitLockerSystemDriveStartupAuthenticationBlockWithoutTpmChipDescription",
                                                                                 "childSettings":  [
@@ -429,7 +429,7 @@
                                                                             },
                                                                             {
                                                                                 "dataType":  16,
-                                                                                "category":  14,
+                                                                                "category":  15,
                                                                                 "nameResourceKey":  "bitLockerSystemDriveStartupAuthenticationTpmName",
                                                                                 "descriptionResourceKey":  "bitLockerSystemDriveStartupAuthenticationTpmDescription",
                                                                                 "childSettings":  [
@@ -461,7 +461,7 @@
                                                                             },
                                                                             {
                                                                                 "dataType":  16,
-                                                                                "category":  14,
+                                                                                "category":  15,
                                                                                 "nameResourceKey":  "bitLockerSystemDriveStartupAuthenticationTpmPinName",
                                                                                 "descriptionResourceKey":  "bitLockerSystemDriveStartupAuthenticationTpmPinDescription",
                                                                                 "childSettings":  [
@@ -493,7 +493,7 @@
                                                                             },
                                                                             {
                                                                                 "dataType":  16,
-                                                                                "category":  14,
+                                                                                "category":  15,
                                                                                 "nameResourceKey":  "bitLockerSystemDriveStartupAuthenticationTpmKeyName",
                                                                                 "descriptionResourceKey":  "bitLockerSystemDriveStartupAuthenticationTpmKeyDescription",
                                                                                 "childSettings":  [
@@ -525,7 +525,7 @@
                                                                             },
                                                                             {
                                                                                 "dataType":  16,
-                                                                                "category":  14,
+                                                                                "category":  15,
                                                                                 "nameResourceKey":  "bitLockerSystemDriveStartupAuthenticationTpmPinKeyName",
                                                                                 "descriptionResourceKey":  "bitLockerSystemDriveStartupAuthenticationTpmPinKeyDescription",
                                                                                 "childSettings":  [
@@ -557,13 +557,13 @@
                                                                             },
                                                                             {
                                                                                 "dataType":  0,
-                                                                                "category":  14,
+                                                                                "category":  15,
                                                                                 "nameResourceKey":  "bitLockerSystemDriveMiniumPinLengthEnableName",
                                                                                 "descriptionResourceKey":  "bitLockerSystemDriveMiniumPinLengthEnableDescription",
                                                                                 "childSettings":  [
                                                                                                       {
                                                                                                           "dataType":  14,
-                                                                                                          "category":  14,
+                                                                                                          "category":  15,
                                                                                                           "nameResourceKey":  "bitLockerSystemDriveMiniumPinLengthName",
                                                                                                           "descriptionResourceKey":  "bitLockerSystemDriveMiniumPinLengthDescription",
                                                                                                           "childSettings":  [
@@ -590,13 +590,13 @@
                                                                             },
                                                                             {
                                                                                 "dataType":  0,
-                                                                                "category":  14,
+                                                                                "category":  15,
                                                                                 "nameResourceKey":  "bitLockerSyntheticSystemDrivePolicyDriveRecoveryName",
                                                                                 "descriptionResourceKey":  "bitLockerSyntheticSystemDrivePolicyDriveRecoveryDescription",
                                                                                 "childSettings":  [
                                                                                                       {
                                                                                                           "dataType":  0,
-                                                                                                          "category":  14,
+                                                                                                          "category":  15,
                                                                                                           "nameResourceKey":  "bitLockerSyntheticSystemDrivePolicyDriveRecoveryAgentName",
                                                                                                           "descriptionResourceKey":  "bitLockerSyntheticSystemDrivePolicyDriveRecoveryAgentDescription",
                                                                                                           "childSettings":  [
@@ -614,7 +614,7 @@
                                                                                                       },
                                                                                                       {
                                                                                                           "dataType":  16,
-                                                                                                          "category":  14,
+                                                                                                          "category":  15,
                                                                                                           "nameResourceKey":  "bitLockerRecoveryOptionsPasswordName",
                                                                                                           "descriptionResourceKey":  "bitLockerRecoveryOptionsPasswordDescription",
                                                                                                           "childSettings":  [
@@ -646,7 +646,7 @@
                                                                                                       },
                                                                                                       {
                                                                                                           "dataType":  16,
-                                                                                                          "category":  14,
+                                                                                                          "category":  15,
                                                                                                           "nameResourceKey":  "bitLockerRecoveryOptionsKeyName",
                                                                                                           "descriptionResourceKey":  "bitLockerRecoveryOptionsKeyDescription",
                                                                                                           "childSettings":  [
@@ -678,7 +678,7 @@
                                                                                                       },
                                                                                                       {
                                                                                                           "dataType":  0,
-                                                                                                          "category":  14,
+                                                                                                          "category":  15,
                                                                                                           "nameResourceKey":  "bitLockerRecoveryOptionsHideName",
                                                                                                           "descriptionResourceKey":  "bitLockerRecoveryOptionsHideDescription",
                                                                                                           "childSettings":  [
@@ -696,7 +696,7 @@
                                                                                                       },
                                                                                                       {
                                                                                                           "dataType":  0,
-                                                                                                          "category":  14,
+                                                                                                          "category":  15,
                                                                                                           "nameResourceKey":  "bitLockerRecoveryOptionsSaveToStoreName",
                                                                                                           "descriptionResourceKey":  "bitLockerRecoveryOptionsSaveToStoreDescription",
                                                                                                           "childSettings":  [
@@ -714,7 +714,7 @@
                                                                                                       },
                                                                                                       {
                                                                                                           "dataType":  16,
-                                                                                                          "category":  14,
+                                                                                                          "category":  15,
                                                                                                           "nameResourceKey":  "bitLockerRecoveryOptionsInformationToStoreName",
                                                                                                           "descriptionResourceKey":  "bitLockerRecoveryOptionsInformationToStoreDescription",
                                                                                                           "childSettings":  [
@@ -741,7 +741,7 @@
                                                                                                       },
                                                                                                       {
                                                                                                           "dataType":  16,
-                                                                                                          "category":  14,
+                                                                                                          "category":  15,
                                                                                                           "nameResourceKey":  "BitLockerRecoveryPasswordRotationName",
                                                                                                           "descriptionResourceKey":  "BitLockerRecoveryPasswordRotationDescription",
                                                                                                           "childSettings":  [
@@ -778,7 +778,7 @@
                                                                                                       },
                                                                                                       {
                                                                                                           "dataType":  0,
-                                                                                                          "category":  14,
+                                                                                                          "category":  15,
                                                                                                           "nameResourceKey":  "bitLockerRecoveryOptionsAfterRecoveryInformationToStoreName",
                                                                                                           "descriptionResourceKey":  "bitLockerRecoveryOptionsAfterRecoveryInformationToStoreDescription",
                                                                                                           "childSettings":  [
@@ -807,13 +807,13 @@
                                                                             },
                                                                             {
                                                                                 "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":  [
@@ -859,7 +859,7 @@
                                                                                                                               "children":  [
                                                                                                                                                {
                                                                                                                                                    "dataType":  20,
-                                                                                                                                                   "category":  14,
+                                                                                                                                                   "category":  15,
                                                                                                                                                    "nameResourceKey":  "bitLockerSystemDrivePrebootRecoveryCustomURLName",
                                                                                                                                                    "descriptionResourceKey":  "bitLockerSystemDrivePrebootRecoveryCustomURLDescription",
                                                                                                                                                    "childSettings":  [
@@ -910,7 +910,7 @@
                                                       "isSettingDescription":  false,
                                                       "showAsSectionHeader":  false,
                                                       "dataType":  8,
-                                                      "category":  14,
+                                                      "category":  15,
                                                       "nameResourceKey":  "bitLockerFixedDriveSettingsName",
                                                       "descriptionResourceKey":  "bitLockerFixedDriveSettingsDescription",
                                                       "childSettings":  [
@@ -925,7 +925,7 @@
                                                   },
                                                   {
                                                       "dataType":  0,
-                                                      "category":  14,
+                                                      "category":  15,
                                                       "nameResourceKey":  "bitLockerFixedDriveWriteAccessName",
                                                       "descriptionResourceKey":  "bitLockerFixedDriveWriteAccessDescription",
                                                       "childSettings":  [
@@ -943,13 +943,13 @@
                                                   },
                                                   {
                                                       "dataType":  0,
-                                                      "category":  14,
+                                                      "category":  15,
                                                       "nameResourceKey":  "bitLockerSyntheticFixedDrivePolicyDriveRecoveryName",
                                                       "descriptionResourceKey":  "bitLockerSyntheticFixedDrivePolicyDriveRecoveryDescription",
                                                       "childSettings":  [
                                                                             {
                                                                                 "dataType":  0,
-                                                                                "category":  14,
+                                                                                "category":  15,
                                                                                 "nameResourceKey":  "bitLockerSyntheticFixedDrivePolicyDriveRecoveryAgentName",
                                                                                 "descriptionResourceKey":  "bitLockerSyntheticFixedDrivePolicyDriveRecoveryAgentDescription",
                                                                                 "childSettings":  [
@@ -967,7 +967,7 @@
                                                                             },
                                                                             {
                                                                                 "dataType":  16,
-                                                                                "category":  14,
+                                                                                "category":  15,
                                                                                 "nameResourceKey":  "bitLockerRecoveryOptionsPasswordName",
                                                                                 "descriptionResourceKey":  "bitLockerRecoveryOptionsPasswordDescription",
                                                                                 "childSettings":  [
@@ -999,7 +999,7 @@
                                                                             },
                                                                             {
                                                                                 "dataType":  16,
-                                                                                "category":  14,
+                                                                                "category":  15,
                                                                                 "nameResourceKey":  "bitLockerRecoveryOptionsKeyName",
                                                                                 "descriptionResourceKey":  "bitLockerRecoveryOptionsKeyDescription",
                                                                                 "childSettings":  [
@@ -1031,7 +1031,7 @@
                                                                             },
                                                                             {
                                                                                 "dataType":  0,
-                                                                                "category":  14,
+                                                                                "category":  15,
                                                                                 "nameResourceKey":  "bitLockerRecoveryOptionsHideName",
                                                                                 "descriptionResourceKey":  "bitLockerRecoveryOptionsHideDescription",
                                                                                 "childSettings":  [
@@ -1049,7 +1049,7 @@
                                                                             },
                                                                             {
                                                                                 "dataType":  0,
-                                                                                "category":  14,
+                                                                                "category":  15,
                                                                                 "nameResourceKey":  "bitLockerRecoveryOptionsSaveToStoreName",
                                                                                 "descriptionResourceKey":  "bitLockerRecoveryOptionsSaveToStoreDescription",
                                                                                 "childSettings":  [
@@ -1067,7 +1067,7 @@
                                                                             },
                                                                             {
                                                                                 "dataType":  16,
-                                                                                "category":  14,
+                                                                                "category":  15,
                                                                                 "nameResourceKey":  "bitLockerRecoveryOptionsInformationToStoreName",
                                                                                 "descriptionResourceKey":  "bitLockerRecoveryOptionsInformationToStoreDescription",
                                                                                 "childSettings":  [
@@ -1094,7 +1094,7 @@
                                                                             },
                                                                             {
                                                                                 "dataType":  0,
-                                                                                "category":  14,
+                                                                                "category":  15,
                                                                                 "nameResourceKey":  "bitLockerRecoveryOptionsAfterRecoveryInformationToStoreName",
                                                                                 "descriptionResourceKey":  "bitLockerRecoveryOptionsAfterRecoveryInformationToStoreDescription",
                                                                                 "childSettings":  [
@@ -1125,7 +1125,7 @@
                                                       "isSettingDescription":  false,
                                                       "showAsSectionHeader":  false,
                                                       "dataType":  8,
-                                                      "category":  14,
+                                                      "category":  15,
                                                       "nameResourceKey":  "bitLockerRemovableDriveSettingsName",
                                                       "descriptionResourceKey":  "bitLockerRemovableDriveSettingsDescription",
                                                       "childSettings":  [
@@ -1140,13 +1140,13 @@
                                                   },
                                                   {
                                                       "dataType":  0,
-                                                      "category":  14,
+                                                      "category":  15,
                                                       "nameResourceKey":  "bitLockerRemovableDriveWriteAccessName",
                                                       "descriptionResourceKey":  "bitLockerRemovableDriveWriteAccessDescription",
                                                       "childSettings":  [
                                                                             {
                                                                                 "dataType":  0,
-                                                                                "category":  14,
+                                                                                "category":  15,
                                                                                 "nameResourceKey":  "bitLockerRemovableDriveWriteAccessCrossOrgName",
                                                                                 "descriptionResourceKey":  "bitLockerRemovableDriveWriteAccessCrossOrgDescription",
                                                                                 "childSettings":  [

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

@@ -2,7 +2,7 @@
     "browser_windows8general":  [
                                     {
                                         "dataType":  0,
-                                        "category":  15,
+                                        "category":  17,
                                         "nameResourceKey":  "blockAutofillName",
                                         "descriptionResourceKey":  "blockAutofillDescription",
                                         "childSettings":  [
@@ -19,7 +19,7 @@
                                     },
                                     {
                                         "dataType":  0,
-                                        "category":  15,
+                                        "category":  17,
                                         "nameResourceKey":  "requireFraudWarningName",
                                         "descriptionResourceKey":  "requireFraudWarningDescription",
                                         "childSettings":  [
@@ -36,7 +36,7 @@
                                     },
                                     {
                                         "dataType":  0,
-                                        "category":  15,
+                                        "category":  17,
                                         "nameResourceKey":  "blockSmartScreenName",
                                         "descriptionResourceKey":  "blockSmartScreenDescription",
                                         "childSettings":  [
@@ -53,7 +53,7 @@
                                     },
                                     {
                                         "dataType":  0,
-                                        "category":  15,
+                                        "category":  17,
                                         "nameResourceKey":  "blockJavaScriptName",
                                         "descriptionResourceKey":  "blockJavaScriptDescription",
                                         "childSettings":  [
@@ -70,7 +70,7 @@
                                     },
                                     {
                                         "dataType":  0,
-                                        "category":  15,
+                                        "category":  17,
                                         "nameResourceKey":  "blockPopUpsName",
                                         "descriptionResourceKey":  "blockPopUpsDescription",
                                         "childSettings":  [
@@ -87,7 +87,7 @@
                                     },
                                     {
                                         "dataType":  0,
-                                        "category":  15,
+                                        "category":  17,
                                         "nameResourceKey":  "blockDoNotTrackHeaderName",
                                         "descriptionResourceKey":  "blockDoNotTrackHeaderDescription",
                                         "childSettings":  [
@@ -104,7 +104,7 @@
                                     },
                                     {
                                         "dataType":  0,
-                                        "category":  15,
+                                        "category":  17,
                                         "nameResourceKey":  "blockPluginsName",
                                         "descriptionResourceKey":  "blockPluginsDescription",
                                         "childSettings":  [
@@ -121,7 +121,7 @@
                                     },
                                     {
                                         "dataType":  0,
-                                        "category":  15,
+                                        "category":  17,
                                         "nameResourceKey":  "blockSingleWordEntryIntranetName",
                                         "descriptionResourceKey":  "blockSingleWordEntryIntranetDescription",
                                         "childSettings":  [
@@ -138,7 +138,7 @@
                                     },
                                     {
                                         "dataType":  0,
-                                        "category":  15,
+                                        "category":  17,
                                         "nameResourceKey":  "blockIntranetAutoDetectName",
                                         "descriptionResourceKey":  "blockIntranetAutoDetectDescription",
                                         "childSettings":  [
@@ -155,7 +155,7 @@
                                     },
                                     {
                                         "dataType":  16,
-                                        "category":  15,
+                                        "category":  17,
                                         "nameResourceKey":  "internetSecurityLevelName",
                                         "descriptionResourceKey":  "internetSecurityLevelDescription",
                                         "childSettings":  [
@@ -192,7 +192,7 @@
                                     },
                                     {
                                         "dataType":  16,
-                                        "category":  15,
+                                        "category":  17,
                                         "nameResourceKey":  "intranetSecurityLevelName",
                                         "descriptionResourceKey":  "intranetSecurityLevelDescription",
                                         "childSettings":  [
@@ -239,7 +239,7 @@
                                     },
                                     {
                                         "dataType":  16,
-                                        "category":  15,
+                                        "category":  17,
                                         "nameResourceKey":  "trustedSitesSecurityLevelName",
                                         "descriptionResourceKey":  "trustedSitesSecurityLevelDescription",
                                         "childSettings":  [
@@ -286,7 +286,7 @@
                                     },
                                     {
                                         "dataType":  0,
-                                        "category":  15,
+                                        "category":  17,
                                         "nameResourceKey":  "restrictedSitesSecurityLevelName",
                                         "descriptionResourceKey":  "restrictedSitesSecurityLevelDescription",
                                         "childSettings":  [
@@ -303,13 +303,13 @@
                                     },
                                     {
                                         "dataType":  0,
-                                        "category":  15,
+                                        "category":  17,
                                         "nameResourceKey":  "enterpriseModeMenuAccessName",
                                         "descriptionResourceKey":  "enterpriseModeMenuAccessDescription",
                                         "childSettings":  [
                                                               {
                                                                   "dataType":  20,
-                                                                  "category":  15,
+                                                                  "category":  17,
                                                                   "nameResourceKey":  "loggingReportLocationName",
                                                                   "descriptionResourceKey":  "loggingReportLocationDescription",
                                                                   "emptyValueResourceKey":  "enterpriseModeLoggingExample",
@@ -336,7 +336,7 @@
                                     },
                                     {
                                         "dataType":  20,
-                                        "category":  15,
+                                        "category":  17,
                                         "nameResourceKey":  "enterpriseModeSiteListLocationName",
                                         "descriptionResourceKey":  "enterpriseModeSiteListLocationDescription",
                                         "emptyValueResourceKey":  "enterpriseModeSiteListExample",

Documentation/ObjectInfo/browser_windowsphonegeneral.json

@@ -1,7 +1,7 @@
 {
     "browser_windowsphonegeneral":  {
                                         "dataType":  0,
-                                        "category":  15,
+                                        "category":  17,
                                         "nameResourceKey":  "blockWebBrowserName",
                                         "descriptionResourceKey":  "blockWebBrowserDescription",
                                         "childSettings":  [

Documentation/ObjectInfo/builtinapps_iosgeneral.json

@@ -4,18 +4,18 @@
                                        "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":  [
 
@@ -41,7 +41,7 @@
                                                              },
                                                              {
                                                                  "dataType":  0,
-                                                                 "category":  16,
+                                                                 "category":  18,
                                                                  "nameResourceKey":  "requireFraudWarningNameIOS",
                                                                  "childSettings":  [
 
@@ -67,13 +67,13 @@
                                        "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":  [
@@ -90,7 +90,7 @@
                                                              },
                                                              {
                                                                  "dataType":  16,
-                                                                 "category":  16,
+                                                                 "category":  18,
                                                                  "nameResourceKey":  "blockCookiesNameIOS",
                                                                  "descriptionResourceKey":  "blockCookiesDescriptionIOS",
                                                                  "childSettings":  [
@@ -127,7 +127,7 @@
                                                              },
                                                              {
                                                                  "dataType":  0,
-                                                                 "category":  16,
+                                                                 "category":  18,
                                                                  "nameResourceKey":  "blockJavaScriptNameIOS",
                                                                  "childSettings":  [
 
@@ -143,7 +143,7 @@
                                                              },
                                                              {
                                                                  "dataType":  0,
-                                                                 "category":  16,
+                                                                 "category":  18,
                                                                  "nameResourceKey":  "blockPopUpsNameIOS",
                                                                  "childSettings":  [
 
@@ -159,7 +159,7 @@
                                                              },
                                                              {
                                                                  "dataType":  0,
-                                                                 "category":  16,
+                                                                 "category":  18,
                                                                  "nameResourceKey":  "onDeviceOnlyDictationForcedName",
                                                                  "descriptionResourceKey":  "onDeviceOnlyDictationForcedDescription",
                                                                  "childSettings":  [
@@ -176,7 +176,7 @@
                                                              },
                                                              {
                                                                  "dataType":  0,
-                                                                 "category":  16,
+                                                                 "category":  18,
                                                                  "nameResourceKey":  "onDeviceOnlyTranslationForcedName",
                                                                  "descriptionResourceKey":  "onDeviceOnlyTranslationForcedDescription",
                                                                  "childSettings":  [
@@ -203,18 +203,18 @@
                                        "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":  [
 
@@ -240,7 +240,7 @@
                                                              },
                                                              {
                                                                  "dataType":  0,
-                                                                 "category":  16,
+                                                                 "category":  18,
                                                                  "nameResourceKey":  "requireSiriProfanityFilterName",
                                                                  "descriptionResourceKey":  "requireSiriProfanityFilterDescription",
                                                                  "childSettings":  [
@@ -257,7 +257,7 @@
                                                              },
                                                              {
                                                                  "dataType":  0,
-                                                                 "category":  16,
+                                                                 "category":  18,
                                                                  "nameResourceKey":  "blockSiriUserGeneratedContentName",
                                                                  "descriptionResourceKey":  "blockSiriUserGeneratedContentDescription",
                                                                  "childSettings":  [
@@ -274,7 +274,7 @@
                                                              },
                                                              {
                                                                  "dataType":  0,
-                                                                 "category":  16,
+                                                                 "category":  18,
                                                                  "nameResourceKey":  "blockAppleNewsName",
                                                                  "childSettings":  [
 
@@ -290,7 +290,7 @@
                                                              },
                                                              {
                                                                  "dataType":  0,
-                                                                 "category":  16,
+                                                                 "category":  18,
                                                                  "nameResourceKey":  "blockIBooksStoreName",
                                                                  "childSettings":  [
 
@@ -306,7 +306,7 @@
                                                              },
                                                              {
                                                                  "dataType":  0,
-                                                                 "category":  16,
+                                                                 "category":  18,
                                                                  "nameResourceKey":  "blockMessagesName",
                                                                  "childSettings":  [
 
@@ -322,7 +322,7 @@
                                                              },
                                                              {
                                                                  "dataType":  0,
-                                                                 "category":  16,
+                                                                 "category":  18,
                                                                  "nameResourceKey":  "blockPodcastsName",
                                                                  "childSettings":  [
 
@@ -338,7 +338,7 @@
                                                              },
                                                              {
                                                                  "dataType":  0,
-                                                                 "category":  16,
+                                                                 "category":  18,
                                                                  "nameResourceKey":  "blockITunesMusicServiceName",
                                                                  "descriptionResourceKey":  "blockITunesMusicServiceDescription",
                                                                  "childSettings":  [
@@ -355,7 +355,7 @@
                                                              },
                                                              {
                                                                  "dataType":  0,
-                                                                 "category":  16,
+                                                                 "category":  18,
                                                                  "nameResourceKey":  "blockITunesRadioName",
                                                                  "childSettings":  [
 
@@ -371,7 +371,7 @@
                                                              },
                                                              {
                                                                  "dataType":  0,
-                                                                 "category":  16,
+                                                                 "category":  18,
                                                                  "nameResourceKey":  "blockITunesStoreName",
                                                                  "childSettings":  [
 
@@ -387,7 +387,7 @@
                                                              },
                                                              {
                                                                  "dataType":  0,
-                                                                 "category":  16,
+                                                                 "category":  18,
                                                                  "nameResourceKey":  "blockFindMyDeviceName",
                                                                  "descriptionResourceKey":  "blockFindMyDeviceDescription",
                                                                  "childSettings":  [
@@ -404,7 +404,7 @@
                                                              },
                                                              {
                                                                  "dataType":  0,
-                                                                 "category":  16,
+                                                                 "category":  18,
                                                                  "nameResourceKey":  "blockFindMyFriendsName",
                                                                  "descriptionResourceKey":  "blockFindMyFriendsDescription",
                                                                  "childSettings":  [
@@ -421,7 +421,7 @@
                                                              },
                                                              {
                                                                  "dataType":  0,
-                                                                 "category":  16,
+                                                                 "category":  18,
                                                                  "nameResourceKey":  "blockFindMyFriendsModificationName",
                                                                  "descriptionResourceKey":  "blockFindMyFriendsModificationDescription",
                                                                  "childSettings":  [
@@ -438,7 +438,7 @@
                                                              },
                                                              {
                                                                  "dataType":  0,
-                                                                 "category":  16,
+                                                                 "category":  18,
                                                                  "nameResourceKey":  "blockSystemAppRemovalName",
                                                                  "descriptionResourceKey":  "blockSystemAppRemovalDescription",
                                                                  "childSettings":  [
@@ -455,7 +455,7 @@
                                                              },
                                                              {
                                                                  "dataType":  0,
-                                                                 "category":  16,
+                                                                 "category":  18,
                                                                  "nameResourceKey":  "blockSafariName",
                                                                  "descriptionResourceKey":  "blockSafariDescription",
                                                                  "childSettings":  [
@@ -472,7 +472,7 @@
                                                              },
                                                              {
                                                                  "dataType":  0,
-                                                                 "category":  16,
+                                                                 "category":  18,
                                                                  "nameResourceKey":  "blockIosSafariAutofillName",
                                                                  "childSettings":  [
 

Documentation/ObjectInfo/builtinapps_macgeneral.json

@@ -3,13 +3,13 @@
                                    "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":  [
@@ -26,7 +26,7 @@
                                                          },
                                                          {
                                                              "dataType":  0,
-                                                             "category":  16,
+                                                             "category":  18,
                                                              "nameResourceKey":  "blockCameraNameMacOS",
                                                              "descriptionResourceKey":  "blockCameraDescriptionMacOS",
                                                              "childSettings":  [
@@ -43,7 +43,7 @@
                                                          },
                                                          {
                                                              "dataType":  0,
-                                                             "category":  16,
+                                                             "category":  18,
                                                              "nameResourceKey":  "blockITunesMusicServiceNameMacOS",
                                                              "childSettings":  [
 
@@ -59,7 +59,7 @@
                                                          },
                                                          {
                                                              "dataType":  0,
-                                                             "category":  16,
+                                                             "category":  18,
                                                              "nameResourceKey":  "blockSpotlightInternetResultsNameMacOS",
                                                              "descriptionResourceKey":  "blockSpotlightInternetResultsDescription",
                                                              "childSettings":  [
@@ -76,7 +76,7 @@
                                                          },
                                                          {
                                                              "dataType":  0,
-                                                             "category":  16,
+                                                             "category":  18,
                                                              "nameResourceKey":  "blockITunesFileSharingName",
                                                              "descriptionResourceKey":  "blockITunesFileSharingDescription",
                                                              "childSettings":  [

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":  [

Documentation/ObjectInfo/cloudandstorage_androidgeneral.json

@@ -2,7 +2,7 @@
     "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

@@ -4,13 +4,13 @@
                                            "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":  [
@@ -27,7 +27,7 @@
                                                                  },
                                                                  {
                                                                      "dataType":  0,
-                                                                     "category":  18,
+                                                                     "category":  21,
                                                                      "nameResourceKey":  "blockManagedAppsCloudSyncName",
                                                                      "descriptionResourceKey":  "blockManagedAppsCloudSyncDescription",
                                                                      "childSettings":  [
@@ -44,7 +44,7 @@
                                                                  },
                                                                  {
                                                                      "dataType":  0,
-                                                                     "category":  18,
+                                                                     "category":  21,
                                                                      "nameResourceKey":  "blockEnterpriseBookBackupName",
                                                                      "childSettings":  [
 
@@ -60,7 +60,7 @@
                                                                  },
                                                                  {
                                                                      "dataType":  0,
-                                                                     "category":  18,
+                                                                     "category":  21,
                                                                      "nameResourceKey":  "blockEnterpriseBookMetadataSyncName",
                                                                      "childSettings":  [
 
@@ -86,13 +86,13 @@
                                            "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":  [
@@ -109,7 +109,7 @@
                                                                  },
                                                                  {
                                                                      "dataType":  0,
-                                                                     "category":  18,
+                                                                     "category":  21,
                                                                      "nameResourceKey":  "blockICloudPhotoLibraryName",
                                                                      "descriptionResourceKey":  "blockICloudPhotoLibraryDescription",
                                                                      "childSettings":  [
@@ -126,7 +126,7 @@
                                                                  },
                                                                  {
                                                                      "dataType":  0,
-                                                                     "category":  18,
+                                                                     "category":  21,
                                                                      "nameResourceKey":  "blockSharedPhotoStreamName",
                                                                      "descriptionResourceKey":  "blockSharedPhotoStreamDescription",
                                                                      "childSettings":  [
@@ -143,7 +143,7 @@
                                                                  },
                                                                  {
                                                                      "dataType":  0,
-                                                                     "category":  18,
+                                                                     "category":  21,
                                                                      "nameResourceKey":  "blockIosActivityContinuationName",
                                                                      "descriptionResourceKey":  "blockIosActivityContinuationDescription",
                                                                      "childSettings":  [
@@ -170,13 +170,13 @@
                                            "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":  [
@@ -193,7 +193,7 @@
                                                                  },
                                                                  {
                                                                      "dataType":  0,
-                                                                     "category":  18,
+                                                                     "category":  21,
                                                                      "nameResourceKey":  "blockIosICloudDocumentSyncName",
                                                                      "descriptionResourceKey":  "blockIosICloudDocumentSyncDescription",
                                                                      "childSettings":  [
@@ -210,7 +210,7 @@
                                                                  },
                                                                  {
                                                                      "dataType":  0,
-                                                                     "category":  18,
+                                                                     "category":  21,
                                                                      "nameResourceKey":  "blockIosKeychainCloudSyncName",
                                                                      "descriptionResourceKey":  "blockIosKeychainCloudSyncDescription",
                                                                      "childSettings":  [
@@ -224,6 +224,23 @@
                                                                      "defaultValue":  false,
                                                                      "policyType":  46,
                                                                      "enabled":  true
+                                                                 },
+                                                                 {
+                                                                     "dataType":  0,
+                                                                     "category":  21,
+                                                                     "nameResourceKey":  "blockIosICloudPrivateRelayName",
+                                                                     "descriptionResourceKey":  "blockIosICloudPrivateRelayDescription",
+                                                                     "childSettings":  [
+
+                                                                                       ],
+                                                                     "options":  [
+
+                                                                                 ],
+                                                                     "entityKey":  "iCloudPrivateRelayBlocked",
+                                                                     "booleanActions":  9,
+                                                                     "defaultValue":  false,
+                                                                     "policyType":  46,
+                                                                     "enabled":  true
                                                                  }
                                                              ],
                                            "options":  [

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":  [
@@ -26,7 +27,24 @@
                                                                  },
                                                                  {
                                                                      "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":  [
@@ -43,7 +61,7 @@
                                                                  },
                                                                  {
                                                                      "dataType":  0,
-                                                                 "category":  18,
+                                                                     "category":  21,
                                                                      "nameResourceKey":  "blockICloudMailName",
                                                                      "descriptionResourceKey":  "blockICloudMailDescription",
                                                                      "childSettings":  [
@@ -60,7 +78,7 @@
                                                                  },
                                                                  {
                                                                      "dataType":  0,
-                                                                 "category":  18,
+                                                                     "category":  21,
                                                                      "nameResourceKey":  "blockICloudAddressBookName",
                                                                      "descriptionResourceKey":  "blockICloudAddressBookDescription",
                                                                      "childSettings":  [
@@ -77,7 +95,7 @@
                                                                  },
                                                                  {
                                                                      "dataType":  0,
-                                                                 "category":  18,
+                                                                     "category":  21,
                                                                      "nameResourceKey":  "blockICloudCalendarName",
                                                                      "descriptionResourceKey":  "blockICloudCalendarDescription",
                                                                      "childSettings":  [
@@ -94,7 +112,7 @@
                                                                  },
                                                                  {
                                                                      "dataType":  0,
-                                                                 "category":  18,
+                                                                     "category":  21,
                                                                      "nameResourceKey":  "blockICloudRemindersName",
                                                                      "descriptionResourceKey":  "blockICloudRemindersDescription",
                                                                      "childSettings":  [
@@ -111,7 +129,7 @@
                                                                  },
                                                                  {
                                                                      "dataType":  0,
-                                                                 "category":  18,
+                                                                     "category":  21,
                                                                      "nameResourceKey":  "blockICloudBookmarksName",
                                                                      "descriptionResourceKey":  "blockICloudBookmarksDescription",
                                                                      "childSettings":  [
@@ -128,7 +146,7 @@
                                                                  },
                                                                  {
                                                                      "dataType":  0,
-                                                                 "category":  18,
+                                                                     "category":  21,
                                                                      "nameResourceKey":  "blockICloudNotesName",
                                                                      "descriptionResourceKey":  "blockICloudNotesDescription",
                                                                      "childSettings":  [
@@ -145,7 +163,7 @@
                                                                  },
                                                                  {
                                                                      "dataType":  0,
-                                                                 "category":  18,
+                                                                     "category":  21,
                                                                      "nameResourceKey":  "MacBlockICloudPhotoLibraryName",
                                                                      "descriptionResourceKey":  "blockICloudPhotoLibraryDescription",
                                                                      "childSettings":  [
@@ -162,7 +180,7 @@
                                                                  },
                                                                  {
                                                                      "dataType":  0,
-                                                                 "category":  18,
+                                                                     "category":  21,
                                                                      "nameResourceKey":  "blockMacActivityContinuationName",
                                                                      "descriptionResourceKey":  "blockMacActivityContinuationDescription",
                                                                      "childSettings":  [
@@ -184,5 +202,39 @@
                                            "booleanActions":  0,
                                            "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

@@ -2,7 +2,7 @@
     "cloudandstorage_windows10general":  [
                                              {
                                                  "dataType":  0,
-                                                 "category":  18,
+                                                 "category":  21,
                                                  "nameResourceKey":  "blockMicrosoftAccountName",
                                                  "descriptionResourceKey":  "blockMicrosoftAccountDescription",
                                                  "childSettings":  [
@@ -19,7 +19,7 @@
                                              },
                                              {
                                                  "dataType":  0,
-                                                 "category":  18,
+                                                 "category":  21,
                                                  "nameResourceKey":  "blockNonMicrosoftAccountName",
                                                  "descriptionResourceKey":  "blockNonMicrosoftAccountDescription",
                                                  "childSettings":  [
@@ -36,7 +36,7 @@
                                              },
                                              {
                                                  "dataType":  0,
-                                                 "category":  18,
+                                                 "category":  21,
                                                  "nameResourceKey":  "blockSettingsSynchronizationForMicrosoftAccountName",
                                                  "descriptionResourceKey":  "blockSettingsSynchronizationForMicrosoftAccountDescription",
                                                  "childSettings":  [
@@ -53,7 +53,7 @@
                                              },
                                              {
                                                  "dataType":  16,
-                                                 "category":  18,
+                                                 "category":  21,
                                                  "nameResourceKey":  "AccountsSignInAssistantSettingsName",
                                                  "descriptionResourceKey":  "AccountsSignInAssistantSettingsDescription",
                                                  "childSettings":  [

Documentation/ObjectInfo/cloudandstorage_windows8general.json

@@ -2,7 +2,7 @@
     "cloudandstorage_windows8general":  [
                                             {
                                                 "dataType":  20,
-                                                "category":  18,
+                                                "category":  21,
                                                 "nameResourceKey":  "workFoldersURLName",
                                                 "descriptionResourceKey":  "workFoldersURLDescription",
                                                 "childSettings":  [
@@ -18,7 +18,7 @@
                                             },
                                             {
                                                 "dataType":  0,
-                                                "category":  18,
+                                                "category":  21,
                                                 "nameResourceKey":  "microsoftAccountOptionalForMailName",
                                                 "descriptionResourceKey":  "microsoftAccountOptionalForMailDescription",
                                                 "childSettings":  [

Documentation/ObjectInfo/cloudprint_windows10general.json

@@ -2,7 +2,7 @@
     "cloudprint_windows10general":  [
                                         {
                                             "dataType":  20,
-                                            "category":  19,
+                                            "category":  22,
                                             "nameResourceKey":  "cloudPrintDiscoveryEndPointName",
                                             "descriptionResourceKey":  "cloudPrintDiscoveryEndPointDescription",
                                             "emptyValueResourceKey":  "cloudPrintDiscoveryEndPointExample",
@@ -21,7 +21,7 @@
                                         },
                                         {
                                             "dataType":  20,
-                                            "category":  19,
+                                            "category":  22,
                                             "nameResourceKey":  "cloudPrintOAuthAuthorityName",
                                             "descriptionResourceKey":  "cloudPrintOAuthAuthorityDescription",
                                             "emptyValueResourceKey":  "cloudPrintOAuthAuthorityExample",
@@ -40,7 +40,7 @@
                                         },
                                         {
                                             "dataType":  20,
-                                            "category":  19,
+                                            "category":  22,
                                             "nameResourceKey":  "cloudPrintOAuthClientIdName",
                                             "descriptionResourceKey":  "cloudPrintOAuthClientIdDescription",
                                             "emptyValueResourceKey":  "cloudPrintOAuthClientIdExample",
@@ -59,7 +59,7 @@
                                         },
                                         {
                                             "dataType":  20,
-                                            "category":  19,
+                                            "category":  22,
                                             "nameResourceKey":  "cloudPrintResourceIdName",
                                             "descriptionResourceKey":  "cloudPrintResourceIdDescription",
                                             "emptyValueResourceKey":  "cloudPrintResourceIdExample",
@@ -78,7 +78,7 @@
                                         },
                                         {
                                             "dataType":  14,
-                                            "category":  19,
+                                            "category":  22,
                                             "nameResourceKey":  "cloudPrintDiscoveryMaxLimitName",
                                             "descriptionResourceKey":  "cloudPrintDiscoveryMaxLimitDescription",
                                             "emptyValueResourceKey":  "cloudPrintDiscoveryMaxLimitExample",
@@ -95,7 +95,7 @@
                                         },
                                         {
                                             "dataType":  20,
-                                            "category":  19,
+                                            "category":  22,
                                             "nameResourceKey":  "mopriaDiscoveryResourceIdName",
                                             "descriptionResourceKey":  "mopriaDiscoveryResourceIdDescription",
                                             "emptyValueResourceKey":  "mopriaDiscoveryResourceIdExample",

Documentation/ObjectInfo/complianceemailprofile_complianceios.json

@@ -3,12 +3,12 @@
                                                  "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

@@ -4,13 +4,13 @@
                                             "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":  [
@@ -37,13 +37,13 @@
                                             "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":  [
@@ -60,7 +60,7 @@
                                                                   },
                                                                   {
                                                                       "dataType":  0,
-                                                                      "category":  20,
+                                                                      "category":  23,
                                                                       "nameResourceKey":  "autoUnlockBlockedName",
                                                                       "descriptionResourceKey":  "autoUnlockBlockedDescription",
                                                                       "childSettings":  [
@@ -87,13 +87,13 @@
                                             "isSettingDescription":  false,
                                             "showAsSectionHeader":  true,
                                             "dataType":  8,
-                                            "category":  20,
+                                            "category":  23,
                                             "nameResourceKey":  "automatedDeviceEnrollmentHeaderName",
                                             "descriptionResourceKey":  "automatedDeviceEnrollmentHeaderDescription",
                                             "childSettings":  [
                                                                   {
                                                                       "dataType":  0,
-                                                                      "category":  20,
+                                                                      "category":  23,
                                                                       "nameResourceKey":  "blockAirDropName",
                                                                       "childSettings":  [
 
@@ -109,7 +109,7 @@
                                                                   },
                                                                   {
                                                                       "dataType":  0,
-                                                                      "category":  20,
+                                                                      "category":  23,
                                                                       "nameResourceKey":  "blockAppleWatchPairingName",
                                                                       "childSettings":  [
 
@@ -125,7 +125,7 @@
                                                                   },
                                                                   {
                                                                       "dataType":  0,
-                                                                      "category":  20,
+                                                                      "category":  23,
                                                                       "nameResourceKey":  "blockBluetoothModificationName",
                                                                       "descriptionResourceKey":  "blockBluetoothModificationDescription",
                                                                       "childSettings":  [
@@ -142,7 +142,7 @@
                                                                   },
                                                                   {
                                                                       "dataType":  0,
-                                                                      "category":  20,
+                                                                      "category":  23,
                                                                       "nameResourceKey":  "blockHostPairingName",
                                                                       "descriptionResourceKey":  "blockHostPairingDescription",
                                                                       "childSettings":  [
@@ -159,12 +159,12 @@
                                                                   },
                                                                   {
                                                                       "dataType":  0,
-                                                                      "category":  20,
+                                                                      "category":  23,
                                                                       "nameResourceKey":  "blockAirPrintNameIOS",
                                                                       "childSettings":  [
                                                                                             {
                                                                                                 "dataType":  0,
-                                                                                                "category":  20,
+                                                                                                "category":  23,
                                                                                                 "nameResourceKey":  "blockAirPrintCredentialsStorageName",
                                                                                                 "descriptionResourceKey":  "blockAirPrintCredentialsStorageDescription",
                                                                                                 "childSettings":  [
@@ -181,7 +181,7 @@
                                                                                             },
                                                                                             {
                                                                                                 "dataType":  0,
-                                                                                                "category":  20,
+                                                                                                "category":  23,
                                                                                                 "nameResourceKey":  "forceAirPrintTrustedTLSNameIOS",
                                                                                                 "descriptionResourceKey":  "forceAirPrintTrustedTLSDescriptionIOS",
                                                                                                 "childSettings":  [
@@ -198,7 +198,7 @@
                                                                                             },
                                                                                             {
                                                                                                 "dataType":  0,
-                                                                                                "category":  20,
+                                                                                                "category":  23,
                                                                                                 "nameResourceKey":  "blockAirPrintiBeaconDiscoveryNameIOS",
                                                                                                 "descriptionResourceKey":  "blockAirPrintiBeaconDiscoveryDescription",
                                                                                                 "childSettings":  [
@@ -225,7 +225,7 @@
                                                                   },
                                                                   {
                                                                       "dataType":  0,
-                                                                      "category":  20,
+                                                                      "category":  23,
                                                                       "nameResourceKey":  "blockProximitySetupToNewDeviceName",
                                                                       "descriptionResourceKey":  "blockProximitySetupToNewDeviceDescription",
                                                                       "childSettings":  [
@@ -242,7 +242,7 @@
                                                                   },
                                                                   {
                                                                       "dataType":  0,
-                                                                      "category":  20,
+                                                                      "category":  23,
                                                                       "nameResourceKey":  "blockFilesUsbDriveAccessName",
                                                                       "descriptionResourceKey":  "blockFilesUsbDriveAccessDescription",
                                                                       "childSettings":  [
@@ -259,7 +259,7 @@
                                                                   },
                                                                   {
                                                                       "dataType":  0,
-                                                                      "category":  20,
+                                                                      "category":  23,
                                                                       "nameResourceKey":  "nfcBlockedName",
                                                                       "descriptionResourceKey":  "nfcBlockedDescription",
                                                                       "childSettings":  [
@@ -276,7 +276,7 @@
                                                                   },
                                                                   {
                                                                       "dataType":  0,
-                                                                      "category":  20,
+                                                                      "category":  23,
                                                                       "nameResourceKey":  "unpairedExternalBootToRecoveryAllowedName",
                                                                       "descriptionResourceKey":  "unpairedExternalBootToRecoveryAllowedDescription",
                                                                       "childSettings":  [

Documentation/ObjectInfo/connecteddevices_macgeneral.json

@@ -3,13 +3,13 @@
                                         "isSettingDescription":  false,
                                         "showAsSectionHeader":  true,
                                         "dataType":  8,
-                                        "category":  20,
+                                        "category":  23,
                                         "nameResourceKey":  "allEnrollmentTypesHeaderNameMac",
                                         "descriptionResourceKey":  "allEnrollmentTypesHeaderDescriptionMac",
                                         "childSettings":  [
                                                               {
                                                                   "dataType":  0,
-                                                                  "category":  20,
+                                                                  "category":  23,
                                                                   "nameResourceKey":  "blockAirDropNameMacOS",
                                                                   "childSettings":  [
 
@@ -25,7 +25,7 @@
                                                               },
                                                               {
                                                                   "dataType":  0,
-                                                                  "category":  20,
+                                                                  "category":  23,
                                                                   "nameResourceKey":  "blockAppleWatchAutoUnlockName",
                                                                   "descriptionResourceKey":  "blockAppleWatchAutoUnlockDescription",
                                                                   "childSettings":  [

Documentation/ObjectInfo/connectivity_androidgeneral.json

@@ -2,7 +2,7 @@
     "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

@@ -2,7 +2,7 @@
     "connectivity_windows10general":  [
                                           {
                                               "dataType":  16,
-                                              "category":  21,
+                                              "category":  24,
                                               "nameResourceKey":  "cellularDataName",
                                               "descriptionResourceKey":  "cellularDataDescription",
                                               "childSettings":  [
@@ -34,7 +34,7 @@
                                           },
                                           {
                                               "dataType":  0,
-                                              "category":  21,
+                                              "category":  24,
                                               "nameResourceKey":  "blockDataRoamingName",
                                               "descriptionResourceKey":  "blockDataRoamingDescription",
                                               "childSettings":  [
@@ -51,7 +51,7 @@
                                           },
                                           {
                                               "dataType":  0,
-                                              "category":  21,
+                                              "category":  24,
                                               "nameResourceKey":  "vpnOverCellularName",
                                               "descriptionResourceKey":  "empty",
                                               "childSettings":  [
@@ -68,7 +68,7 @@
                                           },
                                           {
                                               "dataType":  0,
-                                              "category":  21,
+                                              "category":  24,
                                               "nameResourceKey":  "vpnRoamingOverCellularName",
                                               "descriptionResourceKey":  "empty",
                                               "childSettings":  [
@@ -85,7 +85,7 @@
                                           },
                                           {
                                               "dataType":  0,
-                                              "category":  21,
+                                              "category":  24,
                                               "nameResourceKey":  "blockConnectedDevicesServiceName",
                                               "descriptionResourceKey":  "blockConnectedDevicesServiceDescription",
                                               "childSettings":  [
@@ -102,7 +102,7 @@
                                           },
                                           {
                                               "dataType":  0,
-                                              "category":  21,
+                                              "category":  24,
                                               "nameResourceKey":  "blockNFCName",
                                               "descriptionResourceKey":  "blockNFCDescription",
                                               "childSettings":  [
@@ -119,7 +119,7 @@
                                           },
                                           {
                                               "dataType":  0,
-                                              "category":  21,
+                                              "category":  24,
                                               "nameResourceKey":  "blockWiFiName",
                                               "descriptionResourceKey":  "blockWiFiDescription",
                                               "childSettings":  [
@@ -136,7 +136,7 @@
                                           },
                                           {
                                               "dataType":  0,
-                                              "category":  21,
+                                              "category":  24,
                                               "nameResourceKey":  "blockWiFiHotspotAutoConnectName",
                                               "descriptionResourceKey":  "blockWiFiHotspotAutoConnectDescription",
                                               "childSettings":  [
@@ -153,7 +153,7 @@
                                           },
                                           {
                                               "dataType":  0,
-                                              "category":  21,
+                                              "category":  24,
                                               "nameResourceKey":  "blockManualWifiConfigurationName",
                                               "descriptionResourceKey":  "blockManualWifiConfigurationDescription",
                                               "childSettings":  [
@@ -170,7 +170,7 @@
                                           },
                                           {
                                               "dataType":  14,
-                                              "category":  21,
+                                              "category":  24,
                                               "nameResourceKey":  "wiFiScanIntervalName",
                                               "descriptionResourceKey":  "wiFiScanIntervalDescription",
                                               "emptyValueResourceKey":  "wifiScanIntervalPlaceholder",
@@ -189,7 +189,7 @@
                                               "isSettingDescription":  false,
                                               "showAsSectionHeader":  false,
                                               "dataType":  8,
-                                              "category":  21,
+                                              "category":  24,
                                               "nameResourceKey":  "win10BluetoothHeader",
                                               "childSettings":  [
 
@@ -203,7 +203,7 @@
                                           },
                                           {
                                               "dataType":  0,
-                                              "category":  21,
+                                              "category":  24,
                                               "nameResourceKey":  "blockBluetoothName",
                                               "descriptionResourceKey":  "blockBluetoothDescription",
                                               "childSettings":  [
@@ -220,7 +220,7 @@
                                           },
                                           {
                                               "dataType":  0,
-                                              "category":  21,
+                                              "category":  24,
                                               "nameResourceKey":  "blockBluetoothDiscoverableModeName",
                                               "descriptionResourceKey":  "blockBluetoothDiscoverableModeDescription",
                                               "childSettings":  [
@@ -237,7 +237,7 @@
                                           },
                                           {
                                               "dataType":  0,
-                                              "category":  21,
+                                              "category":  24,
                                               "nameResourceKey":  "blockBluetoothPrepairingName",
                                               "descriptionResourceKey":  "blockBluetoothPrepairingDescription",
                                               "childSettings":  [
@@ -254,7 +254,7 @@
                                           },
                                           {
                                               "dataType":  0,
-                                              "category":  21,
+                                              "category":  24,
                                               "nameResourceKey":  "blockBluetoothAdvertisingName",
                                               "descriptionResourceKey":  "blockBluetoothAdvertisingDescription",
                                               "childSettings":  [
@@ -271,7 +271,7 @@
                                           },
                                           {
                                               "dataType":  0,
-                                              "category":  21,
+                                              "category":  24,
                                               "nameResourceKey":  "bluetoothBlockPromptedProximalConnectionsName",
                                               "descriptionResourceKey":  "bluetoothBlockPromptedProximalConnectionsDescription",
                                               "childSettings":  [
@@ -292,7 +292,7 @@
                                                               {
                                                                   "metadata":  {
                                                                                    "dataType":  20,
-                                                                                   "category":  21,
+                                                                                   "category":  24,
                                                                                    "nameResourceKey":  "bluetoothAllowedServicesName",
                                                                                    "emptyValueResourceKey":  "guidExample",
                                                                                    "childSettings":  [
@@ -309,7 +309,7 @@
                                                               }
                                                           ],
                                               "dataType":  21,
-                                              "category":  21,
+                                              "category":  24,
                                               "nameResourceKey":  "bluetoothAllowedServicesName",
                                               "descriptionResourceKey":  "bluetoothAllowedServicesDescription",
                                               "childSettings":  [

Documentation/ObjectInfo/connectivity_windowsphonegeneral.json

@@ -2,7 +2,7 @@
     "connectivity_windowsphonegeneral":  [
                                              {
                                                  "dataType":  0,
-                                                 "category":  21,
+                                                 "category":  24,
                                                  "nameResourceKey":  "blockWiFiName",
                                                  "descriptionResourceKey":  "blockWiFiDescription",
                                                  "childSettings":  [
@@ -19,7 +19,7 @@
                                              },
                                              {
                                                  "dataType":  0,
-                                                 "category":  21,
+                                                 "category":  24,
                                                  "nameResourceKey":  "blockWiFiTetheringName",
                                                  "descriptionResourceKey":  "empty",
                                                  "childSettings":  [
@@ -36,7 +36,7 @@
                                              },
                                              {
                                                  "dataType":  0,
-                                                 "category":  21,
+                                                 "category":  24,
                                                  "nameResourceKey":  "blockWiFiHotspotAutoConnectName",
                                                  "descriptionResourceKey":  "blockWiFiHotspotAutoConnectDescription",
                                                  "childSettings":  [
@@ -53,7 +53,7 @@
                                              },
                                              {
                                                  "dataType":  0,
-                                                 "category":  21,
+                                                 "category":  24,
                                                  "nameResourceKey":  "blockWiFiHotspotReportingName",
                                                  "descriptionResourceKey":  "blockWiFiHotspotReportingDescription",
                                                  "childSettings":  [
@@ -70,7 +70,7 @@
                                              },
                                              {
                                                  "dataType":  0,
-                                                 "category":  21,
+                                                 "category":  24,
                                                  "nameResourceKey":  "blockNFCName",
                                                  "descriptionResourceKey":  "blockNFCDescription",
                                                  "childSettings":  [
@@ -87,7 +87,7 @@
                                              },
                                              {
                                                  "dataType":  0,
-                                                 "category":  21,
+                                                 "category":  24,
                                                  "nameResourceKey":  "blockBluetoothName",
                                                  "descriptionResourceKey":  "blockBluetoothDescription",
                                                  "childSettings":  [

Documentation/ObjectInfo/contentcaching_macdevicefeatures.json

@@ -3,19 +3,19 @@
                                              "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":  [
@@ -45,8 +45,8 @@
                                                                                                  "enabled":  true
                                                                                              },
                                                                                              {
-                                                                                                 "dataType":  14,
+                                                                                                 "dataType":  15,
-                                                                                                 "category":  22,
+                                                                                                 "category":  25,
                                                                                                  "nameResourceKey":  "contentCachingMaxSizeBytesName",
                                                                                                  "descriptionResourceKey":  "contentCachingMaxSizeBytesDescription",
                                                                                                  "emptyValueResourceKey":  "contentCachingMaxSizeBytesEmptyValue",
@@ -64,7 +64,7 @@
                                                                                              },
                                                                                              {
                                                                                                  "dataType":  20,
-                                                                                                 "category":  22,
+                                                                                                 "category":  25,
                                                                                                  "nameResourceKey":  "contentCachingDataPathName",
                                                                                                  "descriptionResourceKey":  "contentCachingDataPathDescription",
                                                                                                  "emptyValueResourceKey":  "contentCachingDataPathEmptyValue",
@@ -81,7 +81,7 @@
                                                                                              },
                                                                                              {
                                                                                                  "dataType":  14,
-                                                                                                 "category":  22,
+                                                                                                 "category":  25,
                                                                                                  "nameResourceKey":  "contentCachingPortName",
                                                                                                  "descriptionResourceKey":  "contentCachingPortDescription",
                                                                                                  "childSettings":  [
@@ -98,13 +98,13 @@
                                                                                              },
                                                                                              {
                                                                                                  "dataType":  0,
-                                                                                                 "category":  22,
+                                                                                                 "category":  25,
                                                                                                  "nameResourceKey":  "contentCachingDisableConnectionSharingName",
                                                                                                  "descriptionResourceKey":  "contentCachingDisableConnectionSharingDescription",
                                                                                                  "childSettings":  [
                                                                                                                        {
                                                                                                                            "dataType":  0,
-                                                                                                                           "category":  22,
+                                                                                                                           "category":  25,
                                                                                                                            "nameResourceKey":  "contentCachingForceConnectionSharingName",
                                                                                                                            "descriptionResourceKey":  "contentCachingForceConnectionSharingDescription",
                                                                                                                            "childSettings":  [
@@ -129,7 +129,7 @@
                                                                                              },
                                                                                              {
                                                                                                  "dataType":  0,
-                                                                                                 "category":  22,
+                                                                                                 "category":  25,
                                                                                                  "nameResourceKey":  "contentCachingLogClientIdentitiesName",
                                                                                                  "descriptionResourceKey":  "contentCachingLogClientIdentitiesDescription",
                                                                                                  "childSettings":  [
@@ -145,7 +145,7 @@
                                                                                              },
                                                                                              {
                                                                                                  "dataType":  0,
-                                                                                                 "category":  22,
+                                                                                                 "category":  25,
                                                                                                  "nameResourceKey":  "contentCachingBlockDeletionName",
                                                                                                  "descriptionResourceKey":  "contentCachingBlockDeletionDescription",
                                                                                                  "childSettings":  [
@@ -161,7 +161,7 @@
                                                                                              },
                                                                                              {
                                                                                                  "dataType":  0,
-                                                                                                 "category":  22,
+                                                                                                 "category":  25,
                                                                                                  "nameResourceKey":  "contentCachingShowAlertsName",
                                                                                                  "descriptionResourceKey":  "contentCachingShowAlertsDescription",
                                                                                                  "childSettings":  [
@@ -177,7 +177,7 @@
                                                                                              },
                                                                                              {
                                                                                                  "dataType":  0,
-                                                                                                 "category":  22,
+                                                                                                 "category":  25,
                                                                                                  "nameResourceKey":  "contentCachingKeepAwakeName",
                                                                                                  "descriptionResourceKey":  "contentCachingKeepAwakeDescription",
                                                                                                  "childSettings":  [
@@ -193,7 +193,7 @@
                                                                                              },
                                                                                              {
                                                                                                  "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":  [
 
@@ -254,7 +254,7 @@
                                                                                                                                                           {
                                                                                                                                                               "metadata":  {
                                                                                                                                                                                "dataType":  20,
-                                                                                                                                                                               "category":  22,
+                                                                                                                                                                               "category":  25,
                                                                                                                                                                                "nameResourceKey":  "iPRangeLowerAddressName",
                                                                                                                                                                                "emptyValueResourceKey":  "iPRangeLowerAddressEmptyValue",
                                                                                                                                                                                "childSettings":  [
@@ -272,7 +272,7 @@
                                                                                                                                                           {
                                                                                                                                                               "metadata":  {
                                                                                                                                                                                "dataType":  20,
-                                                                                                                                                                               "category":  22,
+                                                                                                                                                                               "category":  25,
                                                                                                                                                                                "nameResourceKey":  "iPRangeUpperAddressName",
                                                                                                                                                                                "emptyValueResourceKey":  "iPRangeUpperAddressEmptyValue",
                                                                                                                                                                                "childSettings":  [
@@ -289,7 +289,7 @@
                                                                                                                                                           }
                                                                                                                                                       ],
                                                                                                                                           "dataType":  21,
-                                                                                                                                          "category":  22,
+                                                                                                                                          "category":  25,
                                                                                                                                           "nameResourceKey":  "contentCachingClientListenRangesName",
                                                                                                                                           "descriptionResourceKey":  "contentCachingClientListenRangesDescription",
                                                                                                                                           "childSettings":  [
@@ -315,7 +315,7 @@
                                                                                                                                                           {
                                                                                                                                                               "metadata":  {
                                                                                                                                                                                "dataType":  16,
-                                                                                                                                                                               "category":  22,
+                                                                                                                                                                               "category":  25,
                                                                                                                                                                                "nameResourceKey":  "iPRangeAddressTypeName",
                                                                                                                                                                                "childSettings":  [
 
@@ -345,7 +345,7 @@
                                                                                                                                                           {
                                                                                                                                                               "metadata":  {
                                                                                                                                                                                "dataType":  20,
-                                                                                                                                                                               "category":  22,
+                                                                                                                                                                               "category":  25,
                                                                                                                                                                                "nameResourceKey":  "iPRangeLowerAddressName",
                                                                                                                                                                                "emptyValueResourceKey":  "iPRangeLowerAddressEmptyValue",
                                                                                                                                                                                "childSettings":  [
@@ -363,7 +363,7 @@
                                                                                                                                                           {
                                                                                                                                                               "metadata":  {
                                                                                                                                                                                "dataType":  20,
-                                                                                                                                                                               "category":  22,
+                                                                                                                                                                               "category":  25,
                                                                                                                                                                                "nameResourceKey":  "iPRangeUpperAddressName",
                                                                                                                                                                                "emptyValueResourceKey":  "iPRangeUpperAddressEmptyValue",
                                                                                                                                                                                "childSettings":  [
@@ -380,7 +380,7 @@
                                                                                                                                                           }
                                                                                                                                                       ],
                                                                                                                                           "dataType":  21,
-                                                                                                                                          "category":  22,
+                                                                                                                                          "category":  25,
                                                                                                                                           "nameResourceKey":  "contentCachingClientListenRangesName",
                                                                                                                                           "descriptionResourceKey":  "contentCachingClientListenRangesDescription",
                                                                                                                                           "childSettings":  [
@@ -409,7 +409,7 @@
                                                                                                                  {
                                                                                                                      "metadata":  {
                                                                                                                                       "dataType":  16,
-                                                                                                                                      "category":  22,
+                                                                                                                                      "category":  25,
                                                                                                                                       "nameResourceKey":  "iPRangeAddressTypeName",
                                                                                                                                       "childSettings":  [
 
@@ -439,7 +439,7 @@
                                                                                                                  {
                                                                                                                      "metadata":  {
                                                                                                                                       "dataType":  20,
-                                                                                                                                      "category":  22,
+                                                                                                                                      "category":  25,
                                                                                                                                       "nameResourceKey":  "iPRangeLowerAddressName",
                                                                                                                                       "emptyValueResourceKey":  "iPRangeLowerAddressEmptyValue",
                                                                                                                                       "childSettings":  [
@@ -457,7 +457,7 @@
                                                                                                                  {
                                                                                                                      "metadata":  {
                                                                                                                                       "dataType":  20,
-                                                                                                                                      "category":  22,
+                                                                                                                                      "category":  25,
                                                                                                                                       "nameResourceKey":  "iPRangeUpperAddressName",
                                                                                                                                       "emptyValueResourceKey":  "iPRangeUpperAddressEmptyValue",
                                                                                                                                       "childSettings":  [
@@ -474,7 +474,7 @@
                                                                                                                  }
                                                                                                              ],
                                                                                                  "dataType":  21,
-                                                                                                 "category":  22,
+                                                                                                 "category":  25,
                                                                                                  "nameResourceKey":  "contentCachingPublicRangesName",
                                                                                                  "descriptionResourceKey":  "contentCachingPublicRangesDescription",
                                                                                                  "childSettings":  [
@@ -490,7 +490,7 @@
                                                                                              },
                                                                                              {
                                                                                                  "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":  [
 
@@ -551,7 +551,7 @@
                                                                                                                                                           {
                                                                                                                                                               "metadata":  {
                                                                                                                                                                                "dataType":  20,
-                                                                                                                                                                               "category":  22,
+                                                                                                                                                                               "category":  25,
                                                                                                                                                                                "nameResourceKey":  "iPRangeLowerAddressName",
                                                                                                                                                                                "emptyValueResourceKey":  "iPRangeLowerAddressEmptyValue",
                                                                                                                                                                                "childSettings":  [
@@ -569,7 +569,7 @@
                                                                                                                                                           {
                                                                                                                                                               "metadata":  {
                                                                                                                                                                                "dataType":  20,
-                                                                                                                                                                               "category":  22,
+                                                                                                                                                                               "category":  25,
                                                                                                                                                                                "nameResourceKey":  "iPRangeUpperAddressName",
                                                                                                                                                                                "emptyValueResourceKey":  "iPRangeUpperAddressEmptyValue",
                                                                                                                                                                                "childSettings":  [
@@ -586,7 +586,7 @@
                                                                                                                                                           }
                                                                                                                                                       ],
                                                                                                                                           "dataType":  21,
-                                                                                                                                          "category":  22,
+                                                                                                                                          "category":  25,
                                                                                                                                           "nameResourceKey":  "contentCachingPeerListenRangesName",
                                                                                                                                           "descriptionResourceKey":  "contentCachingPeerListenRangesDescription",
                                                                                                                                           "childSettings":  [
@@ -605,7 +605,7 @@
                                                                                                                                                           {
                                                                                                                                                               "metadata":  {
                                                                                                                                                                                "dataType":  16,
-                                                                                                                                                                               "category":  22,
+                                                                                                                                                                               "category":  25,
                                                                                                                                                                                "nameResourceKey":  "iPRangeAddressTypeName",
                                                                                                                                                                                "childSettings":  [
 
@@ -635,7 +635,7 @@
                                                                                                                                                           {
                                                                                                                                                               "metadata":  {
                                                                                                                                                                                "dataType":  20,
-                                                                                                                                                                               "category":  22,
+                                                                                                                                                                               "category":  25,
                                                                                                                                                                                "nameResourceKey":  "iPRangeLowerAddressName",
                                                                                                                                                                                "emptyValueResourceKey":  "iPRangeLowerAddressEmptyValue",
                                                                                                                                                                                "childSettings":  [
@@ -653,7 +653,7 @@
                                                                                                                                                           {
                                                                                                                                                               "metadata":  {
                                                                                                                                                                                "dataType":  20,
-                                                                                                                                                                               "category":  22,
+                                                                                                                                                                               "category":  25,
                                                                                                                                                                                "nameResourceKey":  "iPRangeUpperAddressName",
                                                                                                                                                                                "emptyValueResourceKey":  "iPRangeUpperAddressEmptyValue",
                                                                                                                                                                                "childSettings":  [
@@ -670,7 +670,7 @@
                                                                                                                                                           }
                                                                                                                                                       ],
                                                                                                                                           "dataType":  21,
-                                                                                                                                          "category":  22,
+                                                                                                                                          "category":  25,
                                                                                                                                           "nameResourceKey":  "contentCachingPeerFilterRangesName",
                                                                                                                                           "descriptionResourceKey":  "contentCachingPeerFilterRangesDescription",
                                                                                                                                           "childSettings":  [
@@ -699,7 +699,7 @@
                                                                                                                  {
                                                                                                                      "metadata":  {
                                                                                                                                       "dataType":  20,
-                                                                                                                                      "category":  22,
+                                                                                                                                      "category":  25,
                                                                                                                                       "nameResourceKey":  "contentCachingParentsName",
                                                                                                                                       "childSettings":  [
 
@@ -715,7 +715,7 @@
                                                                                                                  }
                                                                                                              ],
                                                                                                  "dataType":  21,
-                                                                                                 "category":  22,
+                                                                                                 "category":  25,
                                                                                                  "nameResourceKey":  "contentCachingParentsName",
                                                                                                  "descriptionResourceKey":  "contentCachingParentsDescription",
                                                                                                  "childSettings":  [
@@ -731,7 +731,7 @@
                                                                                              },
                                                                                              {
                                                                                                  "dataType":  16,
-                                                                                                 "category":  22,
+                                                                                                 "category":  25,
                                                                                                  "nameResourceKey":  "contentCachingParentSelectionPolicyName",
                                                                                                  "descriptionResourceKey":  "contentCachingParentSelectionPolicyDescription",
                                                                                                  "childSettings":  [

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":  [
@@ -40,7 +40,7 @@
                                                                            },
                                                                            {
                                                                                "dataType":  0,
-                                                                               "category":  23,
+                                                                               "category":  26,
                                                                                "nameResourceKey":  "devicesPageName",
                                                                                "descriptionResourceKey":  "devicesPageDescription",
                                                                                "childSettings":  [
@@ -57,7 +57,7 @@
                                                                            },
                                                                            {
                                                                                "dataType":  0,
-                                                                               "category":  23,
+                                                                               "category":  26,
                                                                                "nameResourceKey":  "networkAndInternetPageName",
                                                                                "descriptionResourceKey":  "networkAndInternetPageDescription",
                                                                                "childSettings":  [
@@ -74,7 +74,7 @@
                                                                            },
                                                                            {
                                                                                "dataType":  0,
-                                                                               "category":  23,
+                                                                               "category":  26,
                                                                                "nameResourceKey":  "personalizationPageName",
                                                                                "descriptionResourceKey":  "personalizationPageDescription",
                                                                                "childSettings":  [
@@ -91,7 +91,7 @@
                                                                            },
                                                                            {
                                                                                "dataType":  0,
-                                                                               "category":  23,
+                                                                               "category":  26,
                                                                                "nameResourceKey":  "appsPageName",
                                                                                "descriptionResourceKey":  "appsPageDescription",
                                                                                "childSettings":  [
@@ -108,7 +108,7 @@
                                                                            },
                                                                            {
                                                                                "dataType":  0,
-                                                                               "category":  23,
+                                                                               "category":  26,
                                                                                "nameResourceKey":  "accountsPageName",
                                                                                "descriptionResourceKey":  "accountsPageDescription",
                                                                                "childSettings":  [
@@ -125,13 +125,13 @@
                                                                            },
                                                                            {
                                                                                "dataType":  0,
-                                                                               "category":  23,
+                                                                               "category":  26,
                                                                                "nameResourceKey":  "timeAndLanguagePageName",
                                                                                "descriptionResourceKey":  "timeAndLanguagePageDescription",
                                                                                "childSettings":  [
                                                                                                      {
                                                                                                          "dataType":  0,
-                                                                                                         "category":  23,
+                                                                                                         "category":  26,
                                                                                                          "nameResourceKey":  "settingsBlockChangeSystemTimeName",
                                                                                                          "descriptionResourceKey":  "settingsBlockChangeSystemTimeDesc",
                                                                                                          "childSettings":  [
@@ -148,7 +148,7 @@
                                                                                                      },
                                                                                                      {
                                                                                                          "dataType":  0,
-                                                                                                         "category":  23,
+                                                                                                         "category":  26,
                                                                                                          "nameResourceKey":  "settingsBlockChangeRegionName",
                                                                                                          "descriptionResourceKey":  "settingsBlockChangeRegionDesc",
                                                                                                          "childSettings":  [
@@ -165,7 +165,7 @@
                                                                                                      },
                                                                                                      {
                                                                                                          "dataType":  0,
-                                                                                                         "category":  23,
+                                                                                                         "category":  26,
                                                                                                          "nameResourceKey":  "settingsBlockChangeLanguageName",
                                                                                                          "descriptionResourceKey":  "settingsBlockChangeLanguageDesc",
                                                                                                          "childSettings":  [
@@ -192,7 +192,7 @@
                                                                            },
                                                                            {
                                                                                "dataType":  0,
-                                                                               "category":  23,
+                                                                               "category":  26,
                                                                                "nameResourceKey":  "gamingPageName",
                                                                                "descriptionResourceKey":  "gamingPageDescription",
                                                                                "childSettings":  [
@@ -209,7 +209,7 @@
                                                                            },
                                                                            {
                                                                                "dataType":  0,
-                                                                               "category":  23,
+                                                                               "category":  26,
                                                                                "nameResourceKey":  "easeOfAccessPageName",
                                                                                "descriptionResourceKey":  "easeOfAccessPageDescription",
                                                                                "childSettings":  [
@@ -226,7 +226,7 @@
                                                                            },
                                                                            {
                                                                                "dataType":  0,
-                                                                               "category":  23,
+                                                                               "category":  26,
                                                                                "nameResourceKey":  "privacyPageName",
                                                                                "descriptionResourceKey":  "privacyPageDescription",
                                                                                "childSettings":  [
@@ -243,7 +243,7 @@
                                                                            },
                                                                            {
                                                                                "dataType":  0,
-                                                                               "category":  23,
+                                                                               "category":  26,
                                                                                "nameResourceKey":  "updateAndSecurityPageName",
                                                                                "descriptionResourceKey":  "updateAndSecurityPageDescription",
                                                                                "childSettings":  [

Documentation/ObjectInfo/credentialguard_windows10endpointprotection.json

@@ -1,7 +1,7 @@
 {
     "credentialguard_windows10endpointprotection":  {
                                                         "dataType":  16,
-                                                        "category":  24,
+                                                        "category":  27,
                                                         "nameResourceKey":  "deviceGuardCredentialGuardName",
                                                         "descriptionResourceKey":  "deviceGuardCredentialGuardDescription",
                                                         "childSettings":  [

Documentation/ObjectInfo/customcompliance_compliancewindows10.json

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

Documentation/ObjectInfo/customconfiguration_ioscustom.json

@@ -2,7 +2,7 @@
     "customconfiguration_ioscustom":  [
                                           {
                                               "dataType":  20,
-                                              "category":  25,
+                                              "category":  28,
                                               "nameResourceKey":  "customPolicyConfigurationProfileName",
                                               "descriptionResourceKey":  "customPolicyConfigurationProfileDescription",
                                               "childSettings":  [
@@ -21,7 +21,7 @@
                                               "dataEntityKey":  "payload",
                                               "filenameEntityKey":  "payloadFileName",
                                               "dataType":  2,
-                                              "category":  25,
+                                              "category":  28,
                                               "nameResourceKey":  "customPolicyConfigurationProfileFileName",
                                               "descriptionResourceKey":  "empty",
                                               "childSettings":  [

Documentation/ObjectInfo/customconfiguration_maccustom.json

@@ -2,7 +2,7 @@
     "customconfiguration_maccustom":  [
                                           {
                                               "dataType":  20,
-                                              "category":  25,
+                                              "category":  28,
                                               "nameResourceKey":  "customPolicyConfigurationProfileName",
                                               "descriptionResourceKey":  "customPolicyConfigurationProfileDescription",
                                               "childSettings":  [
@@ -19,7 +19,7 @@
                                           },
                                           {
                                               "dataType":  16,
-                                              "category":  25,
+                                              "category":  28,
                                               "nameResourceKey":  "customPolicyConfigurationDeploymentChannelName",
                                               "descriptionResourceKey":  "customPolicyConfigurationDeploymentChannelDescription",
                                               "childSettings":  [
@@ -48,7 +48,7 @@
                                               "dataEntityKey":  "payload",
                                               "filenameEntityKey":  "payloadFileName",
                                               "dataType":  2,
-                                              "category":  25,
+                                              "category":  28,
                                               "nameResourceKey":  "customPolicyConfigurationProfileFileName",
                                               "descriptionResourceKey":  "empty",
                                               "childSettings":  [

Documentation/ObjectInfo/customomasettings_androidcustom.json

@@ -4,7 +4,7 @@
                                                             {
                                                                 "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

@@ -4,7 +4,7 @@
                                                                    {
                                                                        "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

@@ -4,7 +4,7 @@
                                                               {
                                                                   "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_windowsphonecustom.json

@@ -4,7 +4,7 @@
                                                                  {
                                                                      "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/custompreferences_maccustompreferences.json

@@ -2,7 +2,7 @@
     "custompreferences_maccustompreferences":  [
                                                    {
                                                        "dataType":  20,
-                                                       "category":  27,
+                                                       "category":  30,
                                                        "nameResourceKey":  "customAppConfigurationDomainName",
                                                        "descriptionResourceKey":  "customAppConfigurationDomainDescription",
                                                        "emptyValueResourceKey":  "customAppConfigurationDomainEmptyValue",
@@ -21,7 +21,7 @@
                                                        "dataEntityKey":  "configurationXml",
                                                        "filenameEntityKey":  "fileName",
                                                        "dataType":  2,
-                                                       "category":  27,
+                                                       "category":  30,
                                                        "nameResourceKey":  "customAppConfigurationFileName",
                                                        "childSettings":  [
 

Documentation/ObjectInfo/defender_windows10general.json

@@ -2,7 +2,7 @@
     "defender_windows10general":  [
                                       {
                                           "dataType":  0,
-                                          "category":  28,
+                                          "category":  31,
                                           "nameResourceKey":  "enableRealTimeMonitoringName",
                                           "descriptionResourceKey":  "empty",
                                           "childSettings":  [
@@ -19,7 +19,7 @@
                                       },
                                       {
                                           "dataType":  0,
-                                          "category":  28,
+                                          "category":  31,
                                           "nameResourceKey":  "enableBehaviorMonitoringName",
                                           "descriptionResourceKey":  "EnableBehaviorMonitoringDescription",
                                           "childSettings":  [
@@ -36,7 +36,7 @@
                                       },
                                       {
                                           "dataType":  0,
-                                          "category":  28,
+                                          "category":  31,
                                           "nameResourceKey":  "enableNetworkInspectionSystemName",
                                           "descriptionResourceKey":  "enableNetworkInspectionSystemDescription",
                                           "childSettings":  [
@@ -53,7 +53,7 @@
                                       },
                                       {
                                           "dataType":  0,
-                                          "category":  28,
+                                          "category":  31,
                                           "nameResourceKey":  "scanAllDownloadsName",
                                           "descriptionResourceKey":  "empty",
                                           "childSettings":  [
@@ -70,7 +70,7 @@
                                       },
                                       {
                                           "dataType":  19,
-                                          "category":  28,
+                                          "category":  31,
                                           "nameResourceKey":  "defenderScheduleScanEnableLowCpuPriorityName",
                                           "descriptionResourceKey":  "defenderScheduleScanEnableLowCpuPriorityDescription",
                                           "childSettings":  [
@@ -97,7 +97,7 @@
                                       },
                                       {
                                           "dataType":  19,
-                                          "category":  28,
+                                          "category":  31,
                                           "nameResourceKey":  "defenderDisableCatchupQuickScanName",
                                           "descriptionResourceKey":  "defenderDisableCatchupQuickScanDescription",
                                           "childSettings":  [
@@ -124,7 +124,7 @@
                                       },
                                       {
                                           "dataType":  19,
-                                          "category":  28,
+                                          "category":  31,
                                           "nameResourceKey":  "defenderDisableCatchupFullScanName",
                                           "descriptionResourceKey":  "defenderDisableCatchupFullScanDescription",
                                           "childSettings":  [
@@ -151,7 +151,7 @@
                                       },
                                       {
                                           "dataType":  0,
-                                          "category":  28,
+                                          "category":  31,
                                           "nameResourceKey":  "scriptScanningName",
                                           "descriptionResourceKey":  "empty",
                                           "childSettings":  [
@@ -168,7 +168,7 @@
                                       },
                                       {
                                           "dataType":  0,
-                                          "category":  28,
+                                          "category":  31,
                                           "nameResourceKey":  "enableEndUserAccessToDefenderName",
                                           "descriptionResourceKey":  "empty",
                                           "childSettings":  [
@@ -185,7 +185,7 @@
                                       },
                                       {
                                           "dataType":  16,
-                                          "category":  28,
+                                          "category":  31,
                                           "nameResourceKey":  "signatureUpdateIntervalInHoursName",
                                           "descriptionResourceKey":  "empty",
                                           "childSettings":  [
@@ -329,7 +329,7 @@
                                       },
                                       {
                                           "dataType":  16,
-                                          "category":  28,
+                                          "category":  31,
                                           "nameResourceKey":  "monitorFileAndProgramActivityName",
                                           "descriptionResourceKey":  "empty",
                                           "childSettings":  [
@@ -366,7 +366,7 @@
                                       },
                                       {
                                           "dataType":  14,
-                                          "category":  28,
+                                          "category":  31,
                                           "nameResourceKey":  "daysToTrackResolvedMalwareName",
                                           "descriptionResourceKey":  "DaysToTrackResolvedMalwareDescription",
                                           "emptyValueResourceKey":  "daysToTrackResolvedMalwarePlaceholder",
@@ -384,7 +384,7 @@
                                       },
                                       {
                                           "dataType":  14,
-                                          "category":  28,
+                                          "category":  31,
                                           "nameResourceKey":  "limitCPUUsageDuringScanName",
                                           "descriptionResourceKey":  "limitCPUUsageDuringScanDescription",
                                           "emptyValueResourceKey":  "limitCPUUsageDuringScanPlaceholder",
@@ -401,7 +401,7 @@
                                       },
                                       {
                                           "dataType":  0,
-                                          "category":  28,
+                                          "category":  31,
                                           "nameResourceKey":  "scanArchiveFilesName",
                                           "descriptionResourceKey":  "empty",
                                           "childSettings":  [
@@ -418,7 +418,7 @@
                                       },
                                       {
                                           "dataType":  0,
-                                          "category":  28,
+                                          "category":  31,
                                           "nameResourceKey":  "scanIncomingMailMessagesName",
                                           "descriptionResourceKey":  "empty",
                                           "childSettings":  [
@@ -435,7 +435,7 @@
                                       },
                                       {
                                           "dataType":  0,
-                                          "category":  28,
+                                          "category":  31,
                                           "nameResourceKey":  "scanRemovableDrivesDuringFullScanName",
                                           "descriptionResourceKey":  "scanRemovableDrivesDuringFullScanDescription",
                                           "childSettings":  [
@@ -452,7 +452,7 @@
                                       },
                                       {
                                           "dataType":  0,
-                                          "category":  28,
+                                          "category":  31,
                                           "nameResourceKey":  "scanMappedNetworkDrivesDuringFullScanName",
                                           "descriptionResourceKey":  "readOnlyMappingDescription",
                                           "childSettings":  [
@@ -469,7 +469,7 @@
                                       },
                                       {
                                           "dataType":  0,
-                                          "category":  28,
+                                          "category":  31,
                                           "nameResourceKey":  "scanFilesOpenedFromNetworkFoldersName",
                                           "descriptionResourceKey":  "readOnlyMappingDescription",
                                           "childSettings":  [
@@ -486,7 +486,7 @@
                                       },
                                       {
                                           "dataType":  0,
-                                          "category":  28,
+                                          "category":  31,
                                           "nameResourceKey":  "cloudProtectionName",
                                           "descriptionResourceKey":  "cloudProtectionDescription",
                                           "childSettings":  [
@@ -503,7 +503,7 @@
                                       },
                                       {
                                           "dataType":  16,
-                                          "category":  28,
+                                          "category":  31,
                                           "nameResourceKey":  "fileBlockingLevelName",
                                           "descriptionResourceKey":  "fileBlockingLevelDescription",
                                           "childSettings":  [
@@ -540,7 +540,7 @@
                                       },
                                       {
                                           "dataType":  14,
-                                          "category":  28,
+                                          "category":  31,
                                           "nameResourceKey":  "timeExtensionForFileScanName",
                                           "descriptionResourceKey":  "TimeExtensionForFileScanDescription",
                                           "emptyValueResourceKey":  "timeExtensionForFileScanPlaceholder",
@@ -558,7 +558,7 @@
                                       },
                                       {
                                           "dataType":  16,
-                                          "category":  28,
+                                          "category":  31,
                                           "nameResourceKey":  "promptUsersForSamplesSubmissionName",
                                           "descriptionResourceKey":  "promptUsersForSamplesSubmissionDescription",
                                           "childSettings":  [
@@ -600,7 +600,7 @@
                                       },
                                       {
                                           "dataType":  16,
-                                          "category":  28,
+                                          "category":  31,
                                           "nameResourceKey":  "timeForDailyQuickScanName",
                                           "descriptionResourceKey":  "empty",
                                           "childSettings":  [
@@ -739,7 +739,7 @@
                                       },
                                       {
                                           "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":  [
@@ -821,7 +821,7 @@
                                                                                },
                                                                                {
                                                                                    "dataType":  16,
-                                                                                   "category":  28,
+                                                                                   "category":  31,
                                                                                    "nameResourceKey":  "timeScheduled",
                                                                                    "descriptionResourceKey":  "empty",
                                                                                    "childSettings":  [
@@ -967,7 +967,7 @@
                                                               "children":  [
                                                                                {
                                                                                    "dataType":  16,
-                                                                                   "category":  28,
+                                                                                   "category":  31,
                                                                                    "nameResourceKey":  "dayScheduled",
                                                                                    "descriptionResourceKey":  "empty",
                                                                                    "childSettings":  [
@@ -1031,7 +1031,7 @@
                                                                                },
                                                                                {
                                                                                    "dataType":  16,
-                                                                                   "category":  28,
+                                                                                   "category":  31,
                                                                                    "nameResourceKey":  "timeScheduled",
                                                                                    "descriptionResourceKey":  "empty",
                                                                                    "childSettings":  [
@@ -1181,7 +1181,7 @@
                                       },
                                       {
                                           "dataType":  16,
-                                          "category":  28,
+                                          "category":  31,
                                           "nameResourceKey":  "defenderPotentiallyUnwantedAppActionName",
                                           "descriptionResourceKey":  "defenderPotentiallyUnwantedAppActionDescription",
                                           "childSettings":  [
@@ -1215,7 +1215,7 @@
                                       },
                                       {
                                           "dataType":  19,
-                                          "category":  28,
+                                          "category":  31,
                                           "nameResourceKey":  "defenderBlockOnAccessProtectionName",
                                           "descriptionResourceKey":  "defenderBlockOnAccessProtectionDesc",
                                           "childSettings":  [
@@ -1242,7 +1242,7 @@
                                       },
                                       {
                                           "dataType":  16,
-                                          "category":  28,
+                                          "category":  31,
                                           "nameResourceKey":  "defenderScheduleScanDayName",
                                           "descriptionResourceKey":  "defenderScheduleScanDayDesc",
                                           "childSettings":  [
@@ -1304,13 +1304,13 @@
                                       },
                                       {
                                           "dataType":  0,
-                                          "category":  28,
+                                          "category":  31,
                                           "nameResourceKey":  "defenderDetectedMalwareActionsName",
                                           "descriptionResourceKey":  "defenderDetectedMalwareActionsDescription",
                                           "childSettings":  [
                                                                 {
                                                                     "dataType":  16,
-                                                                    "category":  28,
+                                                                    "category":  31,
                                                                     "nameResourceKey":  "LowSeverity",
                                                                     "descriptionResourceKey":  "empty",
                                                                     "childSettings":  [
@@ -1362,7 +1362,7 @@
                                                                 },
                                                                 {
                                                                     "dataType":  16,
-                                                                    "category":  28,
+                                                                    "category":  31,
                                                                     "nameResourceKey":  "ModerateSeverity",
                                                                     "descriptionResourceKey":  "empty",
                                                                     "childSettings":  [
@@ -1414,7 +1414,7 @@
                                                                 },
                                                                 {
                                                                     "dataType":  16,
-                                                                    "category":  28,
+                                                                    "category":  31,
                                                                     "nameResourceKey":  "HighSeverity",
                                                                     "descriptionResourceKey":  "empty",
                                                                     "childSettings":  [
@@ -1466,7 +1466,7 @@
                                                                 },
                                                                 {
                                                                     "dataType":  16,
-                                                                    "category":  28,
+                                                                    "category":  31,
                                                                     "nameResourceKey":  "SevereSeverity",
                                                                     "descriptionResourceKey":  "empty",
                                                                     "childSettings":  [
@@ -1528,7 +1528,7 @@
                                       },
                                       {
                                           "dataType":  9,
-                                          "category":  28,
+                                          "category":  31,
                                           "childSettings":  [
                                                                 {
                                                                     "complexOptions":  [
@@ -1537,7 +1537,7 @@
                                                                                                                {
                                                                                                                    "metadata":  {
                                                                                                                                     "dataType":  20,
-                                                                                                                                    "category":  28,
+                                                                                                                                    "category":  31,
                                                                                                                                     "nameResourceKey":  "nameColumn",
                                                                                                                                     "emptyValueResourceKey":  "nameColumnExamples",
                                                                                                                                     "childSettings":  [
@@ -1554,7 +1554,7 @@
                                                                                                                }
                                                                                                            ],
                                                                                                "dataType":  21,
-                                                                                               "category":  28,
+                                                                                               "category":  31,
                                                                                                "nameResourceKey":  "filesAndFoldersToExcludeName",
                                                                                                "descriptionResourceKey":  "empty",
                                                                                                "childSettings":  [
@@ -1573,7 +1573,7 @@
                                                                                                                {
                                                                                                                    "metadata":  {
                                                                                                                                     "dataType":  20,
-                                                                                                                                    "category":  28,
+                                                                                                                                    "category":  31,
                                                                                                                                     "nameResourceKey":  "extensionsColumn",
                                                                                                                                     "emptyValueResourceKey":  "extensionsColumnExamples",
                                                                                                                                     "childSettings":  [
@@ -1590,7 +1590,7 @@
                                                                                                                }
                                                                                                            ],
                                                                                                "dataType":  21,
-                                                                                               "category":  28,
+                                                                                               "category":  31,
                                                                                                "nameResourceKey":  "fileExtensionsToExcludeName",
                                                                                                "descriptionResourceKey":  "empty",
                                                                                                "childSettings":  [
@@ -1609,7 +1609,7 @@
                                                                                                                {
                                                                                                                    "metadata":  {
                                                                                                                                     "dataType":  20,
-                                                                                                                                    "category":  28,
+                                                                                                                                    "category":  31,
                                                                                                                                     "nameResourceKey":  "processesColumn",
                                                                                                                                     "emptyValueResourceKey":  "processesColumnExamples",
                                                                                                                                     "childSettings":  [
@@ -1626,7 +1626,7 @@
                                                                                                                }
                                                                                                            ],
                                                                                                "dataType":  21,
-                                                                                               "category":  28,
+                                                                                               "category":  31,
                                                                                                "nameResourceKey":  "processesToExcludeName",
                                                                                                "descriptionResourceKey":  "empty",
                                                                                                "childSettings":  [
@@ -1642,7 +1642,7 @@
                                                                                            }
                                                                                        ],
                                                                     "dataType":  5,
-                                                                    "category":  28,
+                                                                    "category":  31,
                                                                     "nameResourceKey":  "DefenderExclusions",
                                                                     "childSettings":  [
 

Documentation/ObjectInfo/defenderantivirus_windows10endpointprotection.json

@@ -2,7 +2,7 @@
     "defenderantivirus_windows10endpointprotection":  [
                                                           {
                                                               "dataType":  19,
-                                                              "category":  142,
+                                                              "category":  150,
                                                               "nameResourceKey":  "enableRealTimeMonitoringName",
                                                               "descriptionResourceKey":  "empty",
                                                               "childSettings":  [
@@ -28,7 +28,7 @@
                                                           },
                                                           {
                                                               "dataType":  19,
-                                                              "category":  142,
+                                                              "category":  150,
                                                               "nameResourceKey":  "enableBehaviorMonitoringName",
                                                               "descriptionResourceKey":  "EnableBehaviorMonitoringDescription",
                                                               "childSettings":  [
@@ -54,7 +54,7 @@
                                                           },
                                                           {
                                                               "dataType":  19,
-                                                              "category":  142,
+                                                              "category":  150,
                                                               "nameResourceKey":  "enableNetworkInspectionSystemName",
                                                               "descriptionResourceKey":  "enableNetworkInspectionSystemDescription",
                                                               "childSettings":  [
@@ -80,7 +80,7 @@
                                                           },
                                                           {
                                                               "dataType":  19,
-                                                              "category":  142,
+                                                              "category":  150,
                                                               "nameResourceKey":  "scanAllDownloadsName",
                                                               "descriptionResourceKey":  "empty",
                                                               "childSettings":  [
@@ -106,7 +106,7 @@
                                                           },
                                                           {
                                                               "dataType":  19,
-                                                              "category":  142,
+                                                              "category":  150,
                                                               "nameResourceKey":  "defenderScheduleScanEnableLowCpuPriorityName",
                                                               "descriptionResourceKey":  "defenderScheduleScanEnableLowCpuPriorityDescription",
                                                               "childSettings":  [
@@ -133,7 +133,7 @@
                                                           },
                                                           {
                                                               "dataType":  19,
-                                                              "category":  142,
+                                                              "category":  150,
                                                               "nameResourceKey":  "defenderDisableCatchupQuickScanName",
                                                               "descriptionResourceKey":  "defenderDisableCatchupQuickScanDescription",
                                                               "childSettings":  [
@@ -160,7 +160,7 @@
                                                           },
                                                           {
                                                               "dataType":  19,
-                                                              "category":  142,
+                                                              "category":  150,
                                                               "nameResourceKey":  "defenderDisableCatchupFullScanName",
                                                               "descriptionResourceKey":  "defenderDisableCatchupFullScanDescription",
                                                               "childSettings":  [
@@ -187,7 +187,7 @@
                                                           },
                                                           {
                                                               "dataType":  19,
-                                                              "category":  142,
+                                                              "category":  150,
                                                               "nameResourceKey":  "scriptScanningName",
                                                               "descriptionResourceKey":  "empty",
                                                               "childSettings":  [
@@ -213,7 +213,7 @@
                                                           },
                                                           {
                                                               "dataType":  19,
-                                                              "category":  142,
+                                                              "category":  150,
                                                               "nameResourceKey":  "enableEndUserAccessToDefenderName",
                                                               "descriptionResourceKey":  "empty",
                                                               "childSettings":  [
@@ -239,7 +239,7 @@
                                                           },
                                                           {
                                                               "dataType":  0,
-                                                              "category":  142,
+                                                              "category":  150,
                                                               "nameResourceKey":  "checkForSignaturesBeforeRunningScanName",
                                                               "descriptionResourceKey":  "empty",
                                                               "childSettings":  [
@@ -256,7 +256,7 @@
                                                           },
                                                           {
                                                               "dataType":  16,
-                                                              "category":  142,
+                                                              "category":  150,
                                                               "nameResourceKey":  "monitorFileAndProgramActivityName",
                                                               "descriptionResourceKey":  "empty",
                                                               "childSettings":  [
@@ -288,7 +288,7 @@
                                                           },
                                                           {
                                                               "dataType":  14,
-                                                              "category":  142,
+                                                              "category":  150,
                                                               "nameResourceKey":  "daysToTrackResolvedMalwareName",
                                                               "descriptionResourceKey":  "DaysToTrackResolvedMalwareDescription",
                                                               "emptyValueResourceKey":  "daysToTrackResolvedMalwarePlaceholder",
@@ -306,7 +306,7 @@
                                                           },
                                                           {
                                                               "dataType":  14,
-                                                              "category":  142,
+                                                              "category":  150,
                                                               "nameResourceKey":  "limitCPUUsageDuringScanName",
                                                               "descriptionResourceKey":  "limitCPUUsageDuringScanDescription",
                                                               "emptyValueResourceKey":  "limitCPUUsageDuringScanPlaceholder",
@@ -323,7 +323,7 @@
                                                           },
                                                           {
                                                               "dataType":  19,
-                                                              "category":  142,
+                                                              "category":  150,
                                                               "nameResourceKey":  "scanArchiveFilesName",
                                                               "descriptionResourceKey":  "empty",
                                                               "childSettings":  [
@@ -349,7 +349,7 @@
                                                           },
                                                           {
                                                               "dataType":  0,
-                                                              "category":  142,
+                                                              "category":  150,
                                                               "nameResourceKey":  "scanIncomingMailMessagesName",
                                                               "descriptionResourceKey":  "empty",
                                                               "childSettings":  [
@@ -366,7 +366,7 @@
                                                           },
                                                           {
                                                               "dataType":  19,
-                                                              "category":  142,
+                                                              "category":  150,
                                                               "nameResourceKey":  "scanRemovableDrivesDuringFullScanName",
                                                               "descriptionResourceKey":  "scanRemovableDrivesDuringFullScanDescription",
                                                               "childSettings":  [
@@ -392,7 +392,7 @@
                                                           },
                                                           {
                                                               "dataType":  0,
-                                                              "category":  142,
+                                                              "category":  150,
                                                               "nameResourceKey":  "scanMappedNetworkDrivesDuringFullScanName",
                                                               "descriptionResourceKey":  "readOnlyMappingDescription",
                                                               "childSettings":  [
@@ -409,7 +409,7 @@
                                                           },
                                                           {
                                                               "dataType":  19,
-                                                              "category":  142,
+                                                              "category":  150,
                                                               "nameResourceKey":  "scanFilesOpenedFromNetworkFoldersName",
                                                               "descriptionResourceKey":  "readOnlyMappingDescription",
                                                               "childSettings":  [
@@ -435,7 +435,7 @@
                                                           },
                                                           {
                                                               "dataType":  19,
-                                                              "category":  142,
+                                                              "category":  150,
                                                               "nameResourceKey":  "cloudProtectionName",
                                                               "descriptionResourceKey":  "cloudProtectionDescription",
                                                               "childSettings":  [
@@ -461,7 +461,7 @@
                                                           },
                                                           {
                                                               "dataType":  16,
-                                                              "category":  142,
+                                                              "category":  150,
                                                               "nameResourceKey":  "fileBlockingLevelName",
                                                               "descriptionResourceKey":  "fileBlockingLevelDescription",
                                                               "childSettings":  [
@@ -498,7 +498,7 @@
                                                           },
                                                           {
                                                               "dataType":  14,
-                                                              "category":  142,
+                                                              "category":  150,
                                                               "nameResourceKey":  "timeExtensionForFileScanName",
                                                               "descriptionResourceKey":  "TimeExtensionForFileScanDescription",
                                                               "emptyValueResourceKey":  "timeExtensionForFileScanPlaceholder",
@@ -516,7 +516,7 @@
                                                           },
                                                           {
                                                               "dataType":  16,
-                                                              "category":  142,
+                                                              "category":  150,
                                                               "nameResourceKey":  "typeOfSystemScanName",
                                                               "descriptionResourceKey":  "empty",
                                                               "childSettings":  [
@@ -539,7 +539,7 @@
                                                                                   "children":  [
                                                                                                    {
                                                                                                        "dataType":  16,
-                                                                                                       "category":  142,
+                                                                                                       "category":  150,
                                                                                                        "nameResourceKey":  "dayScheduled",
                                                                                                        "descriptionResourceKey":  "empty",
                                                                                                        "childSettings":  [
@@ -601,7 +601,7 @@
                                                                                                    },
                                                                                                    {
                                                                                                        "dataType":  16,
-                                                                                                       "category":  142,
+                                                                                                       "category":  150,
                                                                                                        "nameResourceKey":  "timeScheduled",
                                                                                                        "descriptionResourceKey":  "empty",
                                                                                                        "childSettings":  [
@@ -747,7 +747,7 @@
                                                                                   "children":  [
                                                                                                    {
                                                                                                        "dataType":  16,
-                                                                                                       "category":  142,
+                                                                                                       "category":  150,
                                                                                                        "nameResourceKey":  "dayScheduled",
                                                                                                        "descriptionResourceKey":  "empty",
                                                                                                        "childSettings":  [
@@ -809,7 +809,7 @@
                                                                                                    },
                                                                                                    {
                                                                                                        "dataType":  16,
-                                                                                                       "category":  142,
+                                                                                                       "category":  150,
                                                                                                        "nameResourceKey":  "timeScheduled",
                                                                                                        "descriptionResourceKey":  "empty",
                                                                                                        "childSettings":  [
@@ -959,7 +959,7 @@
                                                           },
                                                           {
                                                               "dataType":  16,
-                                                              "category":  142,
+                                                              "category":  150,
                                                               "nameResourceKey":  "defenderPotentiallyUnwantedAppActionName",
                                                               "descriptionResourceKey":  "defenderPotentiallyUnwantedAppActionDescription",
                                                               "childSettings":  [
@@ -991,7 +991,7 @@
                                                           },
                                                           {
                                                               "dataType":  16,
-                                                              "category":  142,
+                                                              "category":  150,
                                                               "nameResourceKey":  "defenderSubmitSamplesConsentTypeName",
                                                               "descriptionResourceKey":  "defenderSubmitSamplesConsentTypeDesc",
                                                               "childSettings":  [
@@ -1028,7 +1028,7 @@
                                                           },
                                                           {
                                                               "dataType":  19,
-                                                              "category":  142,
+                                                              "category":  150,
                                                               "nameResourceKey":  "defenderBlockOnAccessProtectionName",
                                                               "descriptionResourceKey":  "defenderBlockOnAccessProtectionDesc",
                                                               "childSettings":  [
@@ -1055,13 +1055,13 @@
                                                           },
                                                           {
                                                               "dataType":  0,
-                                                              "category":  142,
+                                                              "category":  150,
                                                               "nameResourceKey":  "defenderDetectedMalwareActionsName",
                                                               "descriptionResourceKey":  "defenderDetectedMalwareActionsDescription",
                                                               "childSettings":  [
                                                                                     {
                                                                                         "dataType":  16,
-                                                                                        "category":  142,
+                                                                                        "category":  150,
                                                                                         "nameResourceKey":  "LowSeverity",
                                                                                         "descriptionResourceKey":  "empty",
                                                                                         "childSettings":  [
@@ -1113,7 +1113,7 @@
                                                                                     },
                                                                                     {
                                                                                         "dataType":  16,
-                                                                                        "category":  142,
+                                                                                        "category":  150,
                                                                                         "nameResourceKey":  "ModerateSeverity",
                                                                                         "descriptionResourceKey":  "empty",
                                                                                         "childSettings":  [
@@ -1165,7 +1165,7 @@
                                                                                     },
                                                                                     {
                                                                                         "dataType":  16,
-                                                                                        "category":  142,
+                                                                                        "category":  150,
                                                                                         "nameResourceKey":  "HighSeverity",
                                                                                         "descriptionResourceKey":  "empty",
                                                                                         "childSettings":  [
@@ -1217,7 +1217,7 @@
                                                                                     },
                                                                                     {
                                                                                         "dataType":  16,
-                                                                                        "category":  142,
+                                                                                        "category":  150,
                                                                                         "nameResourceKey":  "SevereSeverity",
                                                                                         "descriptionResourceKey":  "empty",
                                                                                         "childSettings":  [
@@ -1279,7 +1279,7 @@
                                                           },
                                                           {
                                                               "dataType":  9,
-                                                              "category":  142,
+                                                              "category":  150,
                                                               "childSettings":  [
                                                                                     {
                                                                                         "complexOptions":  [
@@ -1288,7 +1288,7 @@
                                                                                                                                    {
                                                                                                                                        "metadata":  {
                                                                                                                                                         "dataType":  20,
-                                                                                                                                                        "category":  142,
+                                                                                                                                                        "category":  150,
                                                                                                                                                         "nameResourceKey":  "nameColumn",
                                                                                                                                                         "emptyValueResourceKey":  "nameColumnExamples",
                                                                                                                                                         "childSettings":  [
@@ -1305,7 +1305,7 @@
                                                                                                                                    }
                                                                                                                                ],
                                                                                                                    "dataType":  21,
-                                                                                                                   "category":  142,
+                                                                                                                   "category":  150,
                                                                                                                    "nameResourceKey":  "filesAndFoldersToExcludeName",
                                                                                                                    "descriptionResourceKey":  "empty",
                                                                                                                    "childSettings":  [
@@ -1324,7 +1324,7 @@
                                                                                                                                    {
                                                                                                                                        "metadata":  {
                                                                                                                                                         "dataType":  20,
-                                                                                                                                                        "category":  142,
+                                                                                                                                                        "category":  150,
                                                                                                                                                         "nameResourceKey":  "extensionsColumn",
                                                                                                                                                         "emptyValueResourceKey":  "extensionsColumnExamples",
                                                                                                                                                         "childSettings":  [
@@ -1341,7 +1341,7 @@
                                                                                                                                    }
                                                                                                                                ],
                                                                                                                    "dataType":  21,
-                                                                                                                   "category":  142,
+                                                                                                                   "category":  150,
                                                                                                                    "nameResourceKey":  "fileExtensionsToExcludeName",
                                                                                                                    "descriptionResourceKey":  "empty",
                                                                                                                    "childSettings":  [
@@ -1360,7 +1360,7 @@
                                                                                                                                    {
                                                                                                                                        "metadata":  {
                                                                                                                                                         "dataType":  20,
-                                                                                                                                                        "category":  142,
+                                                                                                                                                        "category":  150,
                                                                                                                                                         "nameResourceKey":  "processesColumn",
                                                                                                                                                         "emptyValueResourceKey":  "processesColumnExamples",
                                                                                                                                                         "childSettings":  [
@@ -1377,7 +1377,7 @@
                                                                                                                                    }
                                                                                                                                ],
                                                                                                                    "dataType":  21,
-                                                                                                                   "category":  142,
+                                                                                                                   "category":  150,
                                                                                                                    "nameResourceKey":  "processesToExcludeName",
                                                                                                                    "descriptionResourceKey":  "empty",
                                                                                                                    "childSettings":  [
@@ -1393,7 +1393,7 @@
                                                                                                                }
                                                                                                            ],
                                                                                         "dataType":  5,
-                                                                                        "category":  142,
+                                                                                        "category":  150,
                                                                                         "nameResourceKey":  "DefenderExclusions",
                                                                                         "childSettings":  [
 

Documentation/ObjectInfo/defenderexploitguard_windows10endpointprotection.json

@@ -6,7 +6,7 @@
                                                                                             "isSettingDescription":  false,
                                                                                             "showAsSectionHeader":  false,
                                                                                             "dataType":  8,
-                                                                                            "category":  30,
+                                                                                            "category":  33,
                                                                                             "nameResourceKey":  "exploitGuardASRHeaderText",
                                                                                             "childSettings":  [
 
@@ -22,7 +22,7 @@
                                                                                             "isSettingDescription":  false,
                                                                                             "showAsSectionHeader":  false,
                                                                                             "dataType":  8,
-                                                                                            "category":  30,
+                                                                                            "category":  33,
                                                                                             "nameResourceKey":  "exploitGuardASRLinkText",
                                                                                             "childSettings":  [
 
@@ -38,7 +38,7 @@
                                                                                             "isSettingDescription":  false,
                                                                                             "showAsSectionHeader":  false,
                                                                                             "dataType":  8,
-                                                                                            "category":  30,
+                                                                                            "category":  33,
                                                                                             "nameResourceKey":  "exploitGuardASRRulesName",
                                                                                             "childSettings":  [
 
@@ -52,7 +52,7 @@
                                                                                         },
                                                                                         {
                                                                                             "dataType":  16,
-                                                                                            "category":  30,
+                                                                                            "category":  33,
                                                                                             "nameResourceKey":  "exploitGuardASRPreventCredentialStealingName",
                                                                                             "descriptionResourceKey":  "exploitGuardASRPreventCredentialStealingDesc",
                                                                                             "childSettings":  [
@@ -84,7 +84,7 @@
                                                                                         },
                                                                                         {
                                                                                             "dataType":  16,
-                                                                                            "category":  30,
+                                                                                            "category":  33,
                                                                                             "nameResourceKey":  "exploitGuardASRAdobeReaderLaunchChildProcessName",
                                                                                             "descriptionResourceKey":  "exploitGuardASRAdobeReaderLaunchChildProcessDesc",
                                                                                             "childSettings":  [
@@ -118,7 +118,7 @@
                                                                                             "isSettingDescription":  false,
                                                                                             "showAsSectionHeader":  false,
                                                                                             "dataType":  8,
-                                                                                            "category":  30,
+                                                                                            "category":  33,
                                                                                             "nameResourceKey":  "exploitGuardASROfficeMacros",
                                                                                             "childSettings":  [
 
@@ -132,7 +132,7 @@
                                                                                         },
                                                                                         {
                                                                                             "dataType":  16,
-                                                                                            "category":  30,
+                                                                                            "category":  33,
                                                                                             "nameResourceKey":  "exploitGuardASROfficeAppsInjectionName",
                                                                                             "descriptionResourceKey":  "exploitGuardASROfficeAppsInjectionDesc",
                                                                                             "childSettings":  [
@@ -164,7 +164,7 @@
                                                                                         },
                                                                                         {
                                                                                             "dataType":  16,
-                                                                                            "category":  30,
+                                                                                            "category":  33,
                                                                                             "nameResourceKey":  "exploitGuardASROfficeAppsCreatingExecutableContentName",
                                                                                             "descriptionResourceKey":  "exploitGuardASROfficeAppsCreatingExecutableContentDesc",
                                                                                             "childSettings":  [
@@ -196,7 +196,7 @@
                                                                                         },
                                                                                         {
                                                                                             "dataType":  16,
-                                                                                            "category":  30,
+                                                                                            "category":  33,
                                                                                             "nameResourceKey":  "exploitGuardASROfficeAppLanchChildName",
                                                                                             "descriptionResourceKey":  "exploitGuardASROfficeAppLanchChildDesc",
                                                                                             "childSettings":  [
@@ -228,7 +228,7 @@
                                                                                         },
                                                                                         {
                                                                                             "dataType":  16,
-                                                                                            "category":  30,
+                                                                                            "category":  33,
                                                                                             "nameResourceKey":  "exploitGuardASROfficeAppWin32ImportsName",
                                                                                             "descriptionResourceKey":  "exploitGuardASROfficeAppWin32ImportsDesc",
                                                                                             "childSettings":  [
@@ -260,7 +260,7 @@
                                                                                         },
                                                                                         {
                                                                                             "dataType":  16,
-                                                                                            "category":  30,
+                                                                                            "category":  33,
                                                                                             "nameResourceKey":  "exploitGuardASROfficeCommunicationAppsLaunchChildProcessName",
                                                                                             "descriptionResourceKey":  "exploitGuardASROfficeCommunicationAppsLaunchChildProcessDesc",
                                                                                             "childSettings":  [
@@ -294,7 +294,7 @@
                                                                                             "isSettingDescription":  false,
                                                                                             "showAsSectionHeader":  false,
                                                                                             "dataType":  8,
-                                                                                            "category":  30,
+                                                                                            "category":  33,
                                                                                             "nameResourceKey":  "exploitGuardASRScriptThreatsHeader",
                                                                                             "childSettings":  [
 
@@ -308,7 +308,7 @@
                                                                                         },
                                                                                         {
                                                                                             "dataType":  16,
-                                                                                            "category":  30,
+                                                                                            "category":  33,
                                                                                             "nameResourceKey":  "exploitGuardASRObfuscatedMacroCodeName",
                                                                                             "descriptionResourceKey":  "exploitGuardASRObfuscatedMacroCodeDesc",
                                                                                             "childSettings":  [
@@ -340,7 +340,7 @@
                                                                                         },
                                                                                         {
                                                                                             "dataType":  16,
-                                                                                            "category":  30,
+                                                                                            "category":  33,
                                                                                             "nameResourceKey":  "exploitGuardASRExecutingDownloadedContentName",
                                                                                             "descriptionResourceKey":  "exploitGuardASRExecutingDownloadedContentDesc",
                                                                                             "childSettings":  [
@@ -372,7 +372,7 @@
                                                                                         },
                                                                                         {
                                                                                             "dataType":  16,
-                                                                                            "category":  30,
+                                                                                            "category":  33,
                                                                                             "nameResourceKey":  "exploitGuardASRProcessCreationName",
                                                                                             "descriptionResourceKey":  "exploitGuardASRProcessCreationDesc",
                                                                                             "childSettings":  [
@@ -404,7 +404,7 @@
                                                                                         },
                                                                                         {
                                                                                             "dataType":  16,
-                                                                                            "category":  30,
+                                                                                            "category":  33,
                                                                                             "nameResourceKey":  "exploitGuardASRUntrustedUSBProcessName",
                                                                                             "descriptionResourceKey":  "exploitGuardASRUntrustedUSBProcessDesc",
                                                                                             "childSettings":  [
@@ -436,7 +436,7 @@
                                                                                         },
                                                                                         {
                                                                                             "dataType":  16,
-                                                                                            "category":  30,
+                                                                                            "category":  33,
                                                                                             "nameResourceKey":  "exploitGuardASRUntrustedExecutableName",
                                                                                             "descriptionResourceKey":  "exploitGuardASRUntrustedExecutableDesc",
                                                                                             "childSettings":  [
@@ -470,7 +470,7 @@
                                                                                             "isSettingDescription":  false,
                                                                                             "showAsSectionHeader":  false,
                                                                                             "dataType":  8,
-                                                                                            "category":  30,
+                                                                                            "category":  33,
                                                                                             "nameResourceKey":  "exploitGuardASREmailHeader",
                                                                                             "childSettings":  [
 
@@ -484,7 +484,7 @@
                                                                                         },
                                                                                         {
                                                                                             "dataType":  16,
-                                                                                            "category":  30,
+                                                                                            "category":  33,
                                                                                             "nameResourceKey":  "exploitGuardASREmailEcecutableContentName",
                                                                                             "descriptionResourceKey":  "exploitGuardASREmailEcecutableContentDesc",
                                                                                             "childSettings":  [
@@ -518,7 +518,7 @@
                                                                                             "isSettingDescription":  false,
                                                                                             "showAsSectionHeader":  false,
                                                                                             "dataType":  8,
-                                                                                            "category":  30,
+                                                                                            "category":  33,
                                                                                             "nameResourceKey":  "exploitGuardASRAdvancedRansomewareTitle",
                                                                                             "childSettings":  [
 
@@ -532,7 +532,7 @@
                                                                                         },
                                                                                         {
                                                                                             "dataType":  16,
-                                                                                            "category":  30,
+                                                                                            "category":  33,
                                                                                             "nameResourceKey":  "exploitGuardASRAdvancedRansomewareName",
                                                                                             "descriptionResourceKey":  "exploitGuardASRAdvancedRansomewareDesc",
                                                                                             "childSettings":  [
@@ -566,7 +566,7 @@
                                                                                             "isSettingDescription":  false,
                                                                                             "showAsSectionHeader":  false,
                                                                                             "dataType":  8,
-                                                                                            "category":  30,
+                                                                                            "category":  33,
                                                                                             "nameResourceKey":  "exploitGuardASRExceptionsTitle",
                                                                                             "childSettings":  [
 
@@ -583,7 +583,7 @@
                                                                                                             {
                                                                                                                 "metadata":  {
                                                                                                                                  "dataType":  20,
-                                                                                                                                 "category":  30,
+                                                                                                                                 "category":  33,
                                                                                                                                  "nameResourceKey":  "exploitGuardASRFilesandFoldersName",
                                                                                                                                  "descriptionResourceKey":  "exploitGuardASRFilesandFoldersDesc",
                                                                                                                                  "emptyValueResourceKey":  "exploitGuardASRFilesandFoldersHint",
@@ -601,7 +601,7 @@
                                                                                                             }
                                                                                                         ],
                                                                                             "dataType":  21,
-                                                                                            "category":  30,
+                                                                                            "category":  33,
                                                                                             "nameResourceKey":  "exploitGuardASRExceptionTableName",
                                                                                             "descriptionResourceKey":  "exploitGuardASRExceptionTableDesc",
                                                                                             "childSettings":  [
@@ -617,7 +617,7 @@
                                                                                         }
                                                                                     ],
                                                                  "dataType":  5,
-                                                                 "category":  30,
+                                                                 "category":  33,
                                                                  "nameResourceKey":  "exploitGuardASRChevronName",
                                                                  "childSettings":  [
 
@@ -635,7 +635,7 @@
                                                                                             "isSettingDescription":  false,
                                                                                             "showAsSectionHeader":  false,
                                                                                             "dataType":  8,
-                                                                                            "category":  30,
+                                                                                            "category":  33,
                                                                                             "nameResourceKey":  "exploitGuardCFHeadingText",
                                                                                             "childSettings":  [
 
@@ -651,7 +651,7 @@
                                                                                             "isSettingDescription":  false,
                                                                                             "showAsSectionHeader":  false,
                                                                                             "dataType":  8,
-                                                                                            "category":  30,
+                                                                                            "category":  33,
                                                                                             "nameResourceKey":  "learnMore",
                                                                                             "childSettings":  [
 
@@ -665,7 +665,7 @@
                                                                                         },
                                                                                         {
                                                                                             "dataType":  16,
-                                                                                            "category":  30,
+                                                                                            "category":  33,
                                                                                             "nameResourceKey":  "exploitGuardCFFolderProtectionOptionName",
                                                                                             "descriptionResourceKey":  "exploitGuardCFFolderProtectionOptionDesc",
                                                                                             "childSettings":  [
@@ -674,7 +674,7 @@
                                                                                                                                       {
                                                                                                                                           "metadata":  {
                                                                                                                                                            "dataType":  20,
-                                                                                                                                                           "category":  30,
+                                                                                                                                                           "category":  33,
                                                                                                                                                            "nameResourceKey":  "apps",
                                                                                                                                                            "emptyValueResourceKey":  "exploitGuardCFAdditonalAppsHint",
                                                                                                                                                            "childSettings":  [
@@ -691,7 +691,7 @@
                                                                                                                                       }
                                                                                                                                   ],
                                                                                                                       "dataType":  21,
-                                                                                                                      "category":  30,
+                                                                                                                      "category":  33,
                                                                                                                       "nameResourceKey":  "exploitGuardCFAdditonalAppsName",
                                                                                                                       "descriptionResourceKey":  "exploitGuardCFAdditonalAppsDesc",
                                                                                                                       "childSettings":  [
@@ -710,7 +710,7 @@
                                                                                                                                       {
                                                                                                                                           "metadata":  {
                                                                                                                                                            "dataType":  20,
-                                                                                                                                                           "category":  30,
+                                                                                                                                                           "category":  33,
                                                                                                                                                            "nameResourceKey":  "folders",
                                                                                                                                                            "emptyValueResourceKey":  "exploitGuardCFAdditionalFoldersHint",
                                                                                                                                                            "childSettings":  [
@@ -727,7 +727,7 @@
                                                                                                                                       }
                                                                                                                                   ],
                                                                                                                       "dataType":  21,
-                                                                                                                      "category":  30,
+                                                                                                                      "category":  33,
                                                                                                                       "nameResourceKey":  "exploitGuardCFAdditionalFoldersName",
                                                                                                                       "descriptionResourceKey":  "exploitGuardCFAdditionalFoldersDesc",
                                                                                                                       "childSettings":  [
@@ -778,7 +778,7 @@
                                                                                         }
                                                                                     ],
                                                                  "dataType":  5,
-                                                                 "category":  30,
+                                                                 "category":  33,
                                                                  "nameResourceKey":  "exploitGuardCFChevronName",
                                                                  "childSettings":  [
 
@@ -796,7 +796,7 @@
                                                                                             "isSettingDescription":  false,
                                                                                             "showAsSectionHeader":  false,
                                                                                             "dataType":  8,
-                                                                                            "category":  30,
+                                                                                            "category":  33,
                                                                                             "nameResourceKey":  "exploitGuardNFTitle",
                                                                                             "childSettings":  [
 
@@ -812,7 +812,7 @@
                                                                                             "isSettingDescription":  false,
                                                                                             "showAsSectionHeader":  false,
                                                                                             "dataType":  8,
-                                                                                            "category":  30,
+                                                                                            "category":  33,
                                                                                             "nameResourceKey":  "learnMore",
                                                                                             "childSettings":  [
 
@@ -826,7 +826,7 @@
                                                                                         },
                                                                                         {
                                                                                             "dataType":  16,
-                                                                                            "category":  30,
+                                                                                            "category":  33,
                                                                                             "nameResourceKey":  "exploitGuardNFProtectionName",
                                                                                             "descriptionResourceKey":  "exploitGuardNFProtectionDesc",
                                                                                             "childSettings":  [
@@ -863,7 +863,7 @@
                                                                                         }
                                                                                     ],
                                                                  "dataType":  5,
-                                                                 "category":  30,
+                                                                 "category":  33,
                                                                  "nameResourceKey":  "exploitGuardNFChevronName",
                                                                  "childSettings":  [
 
@@ -879,7 +879,7 @@
                                                                  "complexOptions":  [
                                                                                         {
                                                                                             "dataType":  10,
-                                                                                            "category":  30,
+                                                                                            "category":  33,
                                                                                             "nameResourceKey":  "exploitGuardEPWarningMessage",
                                                                                             "descriptionResourceKey":  "exploitGuardEPWarningMessage",
                                                                                             "childSettings":  [
@@ -896,7 +896,7 @@
                                                                                             "isSettingDescription":  false,
                                                                                             "showAsSectionHeader":  false,
                                                                                             "dataType":  8,
-                                                                                            "category":  30,
+                                                                                            "category":  33,
                                                                                             "nameResourceKey":  "exploitGuardEPExplainationPart1",
                                                                                             "childSettings":  [
 
@@ -912,7 +912,7 @@
                                                                                             "isSettingDescription":  false,
                                                                                             "showAsSectionHeader":  false,
                                                                                             "dataType":  8,
-                                                                                            "category":  30,
+                                                                                            "category":  33,
                                                                                             "nameResourceKey":  "exploitGuardEPExplainationUrlText",
                                                                                             "childSettings":  [
 
@@ -928,7 +928,7 @@
                                                                                             "isSettingDescription":  false,
                                                                                             "showAsSectionHeader":  false,
                                                                                             "dataType":  8,
-                                                                                            "category":  30,
+                                                                                            "category":  33,
                                                                                             "nameResourceKey":  "exploitGuardEPExplainationPart2",
                                                                                             "childSettings":  [
 
@@ -944,7 +944,7 @@
                                                                                             "isSettingDescription":  false,
                                                                                             "showAsSectionHeader":  false,
                                                                                             "dataType":  8,
-                                                                                            "category":  30,
+                                                                                            "category":  33,
                                                                                             "nameResourceKey":  "exploitGuardEPExplainationPart3",
                                                                                             "childSettings":  [
 
@@ -960,7 +960,7 @@
                                                                                             "isSettingDescription":  false,
                                                                                             "showAsSectionHeader":  false,
                                                                                             "dataType":  8,
-                                                                                            "category":  30,
+                                                                                            "category":  33,
                                                                                             "nameResourceKey":  "exploitGuardEPExplainationPart4",
                                                                                             "childSettings":  [
 
@@ -976,7 +976,7 @@
                                                                                             "dataEntityKey":  "defenderExploitProtectionXml",
                                                                                             "filenameEntityKey":  "defenderExploitProtectionXmlFileName",
                                                                                             "dataType":  2,
-                                                                                            "category":  30,
+                                                                                            "category":  33,
                                                                                             "nameResourceKey":  "exploitGuardEPXmlText",
                                                                                             "descriptionResourceKey":  "empty",
                                                                                             "childSettings":  [
@@ -992,7 +992,7 @@
                                                                                         },
                                                                                         {
                                                                                             "dataType":  0,
-                                                                                            "category":  30,
+                                                                                            "category":  33,
                                                                                             "nameResourceKey":  "exploitGuardEPBlockEditingName",
                                                                                             "descriptionResourceKey":  "exploitGuardEPBlockEditingDesc",
                                                                                             "childSettings":  [
@@ -1009,7 +1009,7 @@
                                                                                         }
                                                                                     ],
                                                                  "dataType":  5,
-                                                                 "category":  30,
+                                                                 "category":  33,
                                                                  "nameResourceKey":  "exploitGuardEPChevronName",
                                                                  "childSettings":  [
 

Documentation/ObjectInfo/defenderfirewall_windows10endpointprotection.json

@@ -4,7 +4,7 @@
                                                              "isSettingDescription":  false,
                                                              "showAsSectionHeader":  false,
                                                              "dataType":  8,
-                                                             "category":  33,
+                                                             "category":  36,
                                                              "nameResourceKey":  "globalConfigurationsName",
                                                              "childSettings":  [
 
@@ -20,7 +20,7 @@
                                                              "isSettingDescription":  true,
                                                              "showAsSectionHeader":  false,
                                                              "dataType":  8,
-                                                             "category":  33,
+                                                             "category":  36,
                                                              "nameResourceKey":  "globalConfigurationsDescription",
                                                              "childSettings":  [
 
@@ -34,7 +34,7 @@
                                                          },
                                                          {
                                                              "dataType":  16,
-                                                             "category":  33,
+                                                             "category":  36,
                                                              "nameResourceKey":  "fileTransferProtocolName",
                                                              "descriptionResourceKey":  "fileTransferProtocolDescription",
                                                              "childSettings":  [
@@ -63,7 +63,7 @@
                                                          },
                                                          {
                                                              "dataType":  14,
-                                                             "category":  33,
+                                                             "category":  36,
                                                              "nameResourceKey":  "securityAssociationIdleTimeName",
                                                              "descriptionResourceKey":  "securityAssociationIdleTimeDescription",
                                                              "emptyValueResourceKey":  "securityAssociationIdleTimeHint",
@@ -80,7 +80,7 @@
                                                          },
                                                          {
                                                              "dataType":  0,
-                                                             "category":  33,
+                                                             "category":  36,
                                                              "nameResourceKey":  "presharedKeyEncodingName",
                                                              "descriptionResourceKey":  "presharedKeyEncodingDescription",
                                                              "childSettings":  [
@@ -97,7 +97,7 @@
                                                          },
                                                          {
                                                              "dataType":  13,
-                                                             "category":  33,
+                                                             "category":  36,
                                                              "nameResourceKey":  "iPsecExemptionsName",
                                                              "descriptionResourceKey":  "iPsecExemptionsDescription",
                                                              "childSettings":  [
@@ -137,7 +137,7 @@
                                                          },
                                                          {
                                                              "dataType":  16,
-                                                             "category":  33,
+                                                             "category":  36,
                                                              "nameResourceKey":  "cRLCheckingName",
                                                              "descriptionResourceKey":  "cRLCheckingDescription",
                                                              "childSettings":  [
@@ -174,7 +174,7 @@
                                                          },
                                                          {
                                                              "dataType":  16,
-                                                             "category":  33,
+                                                             "category":  36,
                                                              "nameResourceKey":  "opportunisticallyMatchAuthName",
                                                              "descriptionResourceKey":  "opportunisticallyMatchAuthDescription",
                                                              "childSettings":  [
@@ -203,7 +203,7 @@
                                                          },
                                                          {
                                                              "dataType":  16,
-                                                             "category":  33,
+                                                             "category":  36,
                                                              "nameResourceKey":  "packetQueuingName",
                                                              "descriptionResourceKey":  "packetQueuingDescription",
                                                              "childSettings":  [
@@ -247,7 +247,7 @@
                                                              "isSettingDescription":  false,
                                                              "showAsSectionHeader":  false,
                                                              "dataType":  8,
-                                                             "category":  33,
+                                                             "category":  36,
                                                              "nameResourceKey":  "networkSettingsName",
                                                              "childSettings":  [
 
@@ -263,7 +263,7 @@
                                                              "isSettingDescription":  true,
                                                              "showAsSectionHeader":  false,
                                                              "dataType":  8,
-                                                             "category":  33,
+                                                             "category":  36,
                                                              "nameResourceKey":  "networkSettingsSubtitle",
                                                              "childSettings":  [
 
@@ -277,7 +277,7 @@
                                                          },
                                                          {
                                                              "dataType":  9,
-                                                             "category":  33,
+                                                             "category":  36,
                                                              "childSettings":  [
                                                                                    {
                                                                                        "complexOptions":  [
@@ -285,7 +285,7 @@
                                                                                                                   "isSettingDescription":  false,
                                                                                                                   "showAsSectionHeader":  false,
                                                                                                                   "dataType":  8,
-                                                                                                                  "category":  33,
+                                                                                                                  "category":  36,
                                                                                                                   "nameResourceKey":  "generalNetworkSettingsHeader",
                                                                                                                   "childSettings":  [
 
@@ -299,19 +299,19 @@
                                                                                                               },
                                                                                                               {
                                                                                                                   "dataType":  0,
-                                                                                                                  "category":  33,
+                                                                                                                  "category":  36,
                                                                                                                   "nameResourceKey":  "enableWindowsDefenderFirewallName",
                                                                                                                   "descriptionResourceKey":  "windowsDefenderFirewallDescription",
                                                                                                                   "childSettings":  [
                                                                                                                                         {
                                                                                                                                             "dataType":  16,
-                                                                                                                                            "category":  33,
+                                                                                                                                            "category":  36,
                                                                                                                                             "nameResourceKey":  "stealthModeName",
                                                                                                                                             "descriptionResourceKey":  "stealthModeDescription",
                                                                                                                                             "childSettings":  [
                                                                                                                                                                   {
                                                                                                                                                                       "dataType":  16,
-                                                                                                                                                                      "category":  33,
+                                                                                                                                                                      "category":  36,
                                                                                                                                                                       "nameResourceKey":  "iPsecSecuredPacketExemptionName",
                                                                                                                                                                       "descriptionResourceKey":  "iPsecSecuredPacketExemptionDescription",
                                                                                                                                                                       "childSettings":  [
@@ -368,7 +368,7 @@
                                                                                                                                         },
                                                                                                                                         {
                                                                                                                                             "dataType":  16,
-                                                                                                                                            "category":  33,
+                                                                                                                                            "category":  36,
                                                                                                                                             "nameResourceKey":  "shieldedName",
                                                                                                                                             "descriptionResourceKey":  "shieldedDescription",
                                                                                                                                             "childSettings":  [
@@ -400,7 +400,7 @@
                                                                                                                                         },
                                                                                                                                         {
                                                                                                                                             "dataType":  16,
-                                                                                                                                            "category":  33,
+                                                                                                                                            "category":  36,
                                                                                                                                             "nameResourceKey":  "unicastResponsesToMulticastBroadcastsName",
                                                                                                                                             "descriptionResourceKey":  "unicastResponsesToMulticastBroadcastsDescription",
                                                                                                                                             "childSettings":  [
@@ -432,7 +432,7 @@
                                                                                                                                         },
                                                                                                                                         {
                                                                                                                                             "dataType":  16,
-                                                                                                                                            "category":  33,
+                                                                                                                                            "category":  36,
                                                                                                                                             "nameResourceKey":  "inboundNotificationsName",
                                                                                                                                             "descriptionResourceKey":  "inboundNotificationsDescription",
                                                                                                                                             "childSettings":  [
@@ -464,7 +464,7 @@
                                                                                                                                         },
                                                                                                                                         {
                                                                                                                                             "dataType":  16,
-                                                                                                                                            "category":  33,
+                                                                                                                                            "category":  36,
                                                                                                                                             "nameResourceKey":  "outboundConnectionsName",
                                                                                                                                             "descriptionResourceKey":  "outboundConnectionsDescription",
                                                                                                                                             "childSettings":  [
@@ -496,7 +496,7 @@
                                                                                                                                         },
                                                                                                                                         {
                                                                                                                                             "dataType":  16,
-                                                                                                                                            "category":  33,
+                                                                                                                                            "category":  36,
                                                                                                                                             "nameResourceKey":  "inboundConnectionsName",
                                                                                                                                             "descriptionResourceKey":  "inboundConnectionsDescription",
                                                                                                                                             "childSettings":  [
@@ -530,7 +530,7 @@
                                                                                                                                             "isSettingDescription":  false,
                                                                                                                                             "showAsSectionHeader":  false,
                                                                                                                                             "dataType":  8,
-                                                                                                                                            "category":  33,
+                                                                                                                                            "category":  36,
                                                                                                                                             "nameResourceKey":  "ruleMergingName",
                                                                                                                                             "childSettings":  [
 
@@ -544,7 +544,7 @@
                                                                                                                                         },
                                                                                                                                         {
                                                                                                                                             "dataType":  16,
-                                                                                                                                            "category":  33,
+                                                                                                                                            "category":  36,
                                                                                                                                             "nameResourceKey":  "authorizedAppRulesName",
                                                                                                                                             "descriptionResourceKey":  "authorizedAppRulesDescription",
                                                                                                                                             "childSettings":  [
@@ -576,7 +576,7 @@
                                                                                                                                         },
                                                                                                                                         {
                                                                                                                                             "dataType":  16,
-                                                                                                                                            "category":  33,
+                                                                                                                                            "category":  36,
                                                                                                                                             "nameResourceKey":  "globalRulesName",
                                                                                                                                             "descriptionResourceKey":  "globalRulesDescription",
                                                                                                                                             "childSettings":  [
@@ -608,7 +608,7 @@
                                                                                                                                         },
                                                                                                                                         {
                                                                                                                                             "dataType":  16,
-                                                                                                                                            "category":  33,
+                                                                                                                                            "category":  36,
                                                                                                                                             "nameResourceKey":  "localStoreName",
                                                                                                                                             "descriptionResourceKey":  "localStoreDescription",
                                                                                                                                             "childSettings":  [
@@ -640,7 +640,7 @@
                                                                                                                                         },
                                                                                                                                         {
                                                                                                                                             "dataType":  16,
-                                                                                                                                            "category":  33,
+                                                                                                                                            "category":  36,
                                                                                                                                             "nameResourceKey":  "iPsecRulesName",
                                                                                                                                             "descriptionResourceKey":  "iPsecRulesDescription",
                                                                                                                                             "childSettings":  [
@@ -682,7 +682,7 @@
                                                                                                               }
                                                                                                           ],
                                                                                        "dataType":  5,
-                                                                                       "category":  33,
+                                                                                       "category":  36,
                                                                                        "nameResourceKey":  "domainNetworkName",
                                                                                        "childSettings":  [
 
@@ -700,7 +700,7 @@
                                                                                                                   "isSettingDescription":  false,
                                                                                                                   "showAsSectionHeader":  false,
                                                                                                                   "dataType":  8,
-                                                                                                                  "category":  33,
+                                                                                                                  "category":  36,
                                                                                                                   "nameResourceKey":  "generalNetworkSettingsHeader",
                                                                                                                   "childSettings":  [
 
@@ -714,19 +714,19 @@
                                                                                                               },
                                                                                                               {
                                                                                                                   "dataType":  0,
-                                                                                                                  "category":  33,
+                                                                                                                  "category":  36,
                                                                                                                   "nameResourceKey":  "enableWindowsDefenderFirewallName",
                                                                                                                   "descriptionResourceKey":  "windowsDefenderFirewallDescription",
                                                                                                                   "childSettings":  [
                                                                                                                                         {
                                                                                                                                             "dataType":  16,
-                                                                                                                                            "category":  33,
+                                                                                                                                            "category":  36,
                                                                                                                                             "nameResourceKey":  "stealthModeName",
                                                                                                                                             "descriptionResourceKey":  "stealthModeDescription",
                                                                                                                                             "childSettings":  [
                                                                                                                                                                   {
                                                                                                                                                                       "dataType":  16,
-                                                                                                                                                                      "category":  33,
+                                                                                                                                                                      "category":  36,
                                                                                                                                                                       "nameResourceKey":  "iPsecSecuredPacketExemptionName",
                                                                                                                                                                       "descriptionResourceKey":  "iPsecSecuredPacketExemptionDescription",
                                                                                                                                                                       "childSettings":  [
@@ -783,7 +783,7 @@
                                                                                                                                         },
                                                                                                                                         {
                                                                                                                                             "dataType":  16,
-                                                                                                                                            "category":  33,
+                                                                                                                                            "category":  36,
                                                                                                                                             "nameResourceKey":  "shieldedName",
                                                                                                                                             "descriptionResourceKey":  "shieldedDescription",
                                                                                                                                             "childSettings":  [
@@ -815,7 +815,7 @@
                                                                                                                                         },
                                                                                                                                         {
                                                                                                                                             "dataType":  16,
-                                                                                                                                            "category":  33,
+                                                                                                                                            "category":  36,
                                                                                                                                             "nameResourceKey":  "unicastResponsesToMulticastBroadcastsName",
                                                                                                                                             "descriptionResourceKey":  "unicastResponsesToMulticastBroadcastsDescription",
                                                                                                                                             "childSettings":  [
@@ -847,7 +847,7 @@
                                                                                                                                         },
                                                                                                                                         {
                                                                                                                                             "dataType":  16,
-                                                                                                                                            "category":  33,
+                                                                                                                                            "category":  36,
                                                                                                                                             "nameResourceKey":  "inboundNotificationsName",
                                                                                                                                             "descriptionResourceKey":  "inboundNotificationsDescription",
                                                                                                                                             "childSettings":  [
@@ -879,7 +879,7 @@
                                                                                                                                         },
                                                                                                                                         {
                                                                                                                                             "dataType":  16,
-                                                                                                                                            "category":  33,
+                                                                                                                                            "category":  36,
                                                                                                                                             "nameResourceKey":  "outboundConnectionsName",
                                                                                                                                             "descriptionResourceKey":  "outboundConnectionsDescription",
                                                                                                                                             "childSettings":  [
@@ -911,7 +911,7 @@
                                                                                                                                         },
                                                                                                                                         {
                                                                                                                                             "dataType":  16,
-                                                                                                                                            "category":  33,
+                                                                                                                                            "category":  36,
                                                                                                                                             "nameResourceKey":  "inboundConnectionsName",
                                                                                                                                             "descriptionResourceKey":  "inboundConnectionsDescription",
                                                                                                                                             "childSettings":  [
@@ -945,7 +945,7 @@
                                                                                                                                             "isSettingDescription":  false,
                                                                                                                                             "showAsSectionHeader":  false,
                                                                                                                                             "dataType":  8,
-                                                                                                                                            "category":  33,
+                                                                                                                                            "category":  36,
                                                                                                                                             "nameResourceKey":  "ruleMergingName",
                                                                                                                                             "childSettings":  [
 
@@ -959,7 +959,7 @@
                                                                                                                                         },
                                                                                                                                         {
                                                                                                                                             "dataType":  16,
-                                                                                                                                            "category":  33,
+                                                                                                                                            "category":  36,
                                                                                                                                             "nameResourceKey":  "authorizedAppRulesName",
                                                                                                                                             "descriptionResourceKey":  "authorizedAppRulesDescription",
                                                                                                                                             "childSettings":  [
@@ -991,7 +991,7 @@
                                                                                                                                         },
                                                                                                                                         {
                                                                                                                                             "dataType":  16,
-                                                                                                                                            "category":  33,
+                                                                                                                                            "category":  36,
                                                                                                                                             "nameResourceKey":  "globalRulesName",
                                                                                                                                             "descriptionResourceKey":  "globalRulesDescription",
                                                                                                                                             "childSettings":  [
@@ -1023,7 +1023,7 @@
                                                                                                                                         },
                                                                                                                                         {
                                                                                                                                             "dataType":  16,
-                                                                                                                                            "category":  33,
+                                                                                                                                            "category":  36,
                                                                                                                                             "nameResourceKey":  "localStoreName",
                                                                                                                                             "descriptionResourceKey":  "localStoreDescription",
                                                                                                                                             "childSettings":  [
@@ -1055,7 +1055,7 @@
                                                                                                                                         },
                                                                                                                                         {
                                                                                                                                             "dataType":  16,
-                                                                                                                                            "category":  33,
+                                                                                                                                            "category":  36,
                                                                                                                                             "nameResourceKey":  "iPsecRulesName",
                                                                                                                                             "descriptionResourceKey":  "iPsecRulesDescription",
                                                                                                                                             "childSettings":  [
@@ -1097,7 +1097,7 @@
                                                                                                               }
                                                                                                           ],
                                                                                        "dataType":  5,
-                                                                                       "category":  33,
+                                                                                       "category":  36,
                                                                                        "nameResourceKey":  "privateNetworkName",
                                                                                        "childSettings":  [
 
@@ -1115,7 +1115,7 @@
                                                                                                                   "isSettingDescription":  false,
                                                                                                                   "showAsSectionHeader":  false,
                                                                                                                   "dataType":  8,
-                                                                                                                  "category":  33,
+                                                                                                                  "category":  36,
                                                                                                                   "nameResourceKey":  "generalNetworkSettingsHeader",
                                                                                                                   "childSettings":  [
 
@@ -1129,19 +1129,19 @@
                                                                                                               },
                                                                                                               {
                                                                                                                   "dataType":  0,
-                                                                                                                  "category":  33,
+                                                                                                                  "category":  36,
                                                                                                                   "nameResourceKey":  "enableWindowsDefenderFirewallName",
                                                                                                                   "descriptionResourceKey":  "windowsDefenderFirewallDescription",
                                                                                                                   "childSettings":  [
                                                                                                                                         {
                                                                                                                                             "dataType":  16,
-                                                                                                                                            "category":  33,
+                                                                                                                                            "category":  36,
                                                                                                                                             "nameResourceKey":  "stealthModeName",
                                                                                                                                             "descriptionResourceKey":  "stealthModeDescription",
                                                                                                                                             "childSettings":  [
                                                                                                                                                                   {
                                                                                                                                                                       "dataType":  16,
-                                                                                                                                                                      "category":  33,
+                                                                                                                                                                      "category":  36,
                                                                                                                                                                       "nameResourceKey":  "iPsecSecuredPacketExemptionName",
                                                                                                                                                                       "descriptionResourceKey":  "iPsecSecuredPacketExemptionDescription",
                                                                                                                                                                       "childSettings":  [
@@ -1198,7 +1198,7 @@
                                                                                                                                         },
                                                                                                                                         {
                                                                                                                                             "dataType":  16,
-                                                                                                                                            "category":  33,
+                                                                                                                                            "category":  36,
                                                                                                                                             "nameResourceKey":  "shieldedName",
                                                                                                                                             "descriptionResourceKey":  "shieldedDescription",
                                                                                                                                             "childSettings":  [
@@ -1230,7 +1230,7 @@
                                                                                                                                         },
                                                                                                                                         {
                                                                                                                                             "dataType":  16,
-                                                                                                                                            "category":  33,
+                                                                                                                                            "category":  36,
                                                                                                                                             "nameResourceKey":  "unicastResponsesToMulticastBroadcastsName",
                                                                                                                                             "descriptionResourceKey":  "unicastResponsesToMulticastBroadcastsDescription",
                                                                                                                                             "childSettings":  [
@@ -1262,7 +1262,7 @@
                                                                                                                                         },
                                                                                                                                         {
                                                                                                                                             "dataType":  16,
-                                                                                                                                            "category":  33,
+                                                                                                                                            "category":  36,
                                                                                                                                             "nameResourceKey":  "inboundNotificationsName",
                                                                                                                                             "descriptionResourceKey":  "inboundNotificationsDescription",
                                                                                                                                             "childSettings":  [
@@ -1294,7 +1294,7 @@
                                                                                                                                         },
                                                                                                                                         {
                                                                                                                                             "dataType":  16,
-                                                                                                                                            "category":  33,
+                                                                                                                                            "category":  36,
                                                                                                                                             "nameResourceKey":  "outboundConnectionsName",
                                                                                                                                             "descriptionResourceKey":  "outboundConnectionsDescription",
                                                                                                                                             "childSettings":  [
@@ -1326,7 +1326,7 @@
                                                                                                                                         },
                                                                                                                                         {
                                                                                                                                             "dataType":  16,
-                                                                                                                                            "category":  33,
+                                                                                                                                            "category":  36,
                                                                                                                                             "nameResourceKey":  "inboundConnectionsName",
                                                                                                                                             "descriptionResourceKey":  "inboundConnectionsDescription",
                                                                                                                                             "childSettings":  [
@@ -1360,7 +1360,7 @@
                                                                                                                                             "isSettingDescription":  false,
                                                                                                                                             "showAsSectionHeader":  false,
                                                                                                                                             "dataType":  8,
-                                                                                                                                            "category":  33,
+                                                                                                                                            "category":  36,
                                                                                                                                             "nameResourceKey":  "ruleMergingName",
                                                                                                                                             "childSettings":  [
 
@@ -1374,7 +1374,7 @@
                                                                                                                                         },
                                                                                                                                         {
                                                                                                                                             "dataType":  16,
-                                                                                                                                            "category":  33,
+                                                                                                                                            "category":  36,
                                                                                                                                             "nameResourceKey":  "authorizedAppRulesName",
                                                                                                                                             "descriptionResourceKey":  "authorizedAppRulesDescription",
                                                                                                                                             "childSettings":  [
@@ -1406,7 +1406,7 @@
                                                                                                                                         },
                                                                                                                                         {
                                                                                                                                             "dataType":  16,
-                                                                                                                                            "category":  33,
+                                                                                                                                            "category":  36,
                                                                                                                                             "nameResourceKey":  "globalRulesName",
                                                                                                                                             "descriptionResourceKey":  "globalRulesDescription",
                                                                                                                                             "childSettings":  [
@@ -1438,7 +1438,7 @@
                                                                                                                                         },
                                                                                                                                         {
                                                                                                                                             "dataType":  16,
-                                                                                                                                            "category":  33,
+                                                                                                                                            "category":  36,
                                                                                                                                             "nameResourceKey":  "localStoreName",
                                                                                                                                             "descriptionResourceKey":  "localStoreDescription",
                                                                                                                                             "childSettings":  [
@@ -1470,7 +1470,7 @@
                                                                                                                                         },
                                                                                                                                         {
                                                                                                                                             "dataType":  16,
-                                                                                                                                            "category":  33,
+                                                                                                                                            "category":  36,
                                                                                                                                             "nameResourceKey":  "iPsecRulesName",
                                                                                                                                             "descriptionResourceKey":  "iPsecRulesDescription",
                                                                                                                                             "childSettings":  [
@@ -1512,7 +1512,7 @@
                                                                                                               }
                                                                                                           ],
                                                                                        "dataType":  5,
-                                                                                       "category":  33,
+                                                                                       "category":  36,
                                                                                        "nameResourceKey":  "publicNetworkName",
                                                                                        "childSettings":  [
 
@@ -1536,7 +1536,7 @@
                                                              "isSettingDescription":  false,
                                                              "showAsSectionHeader":  false,
                                                              "dataType":  8,
-                                                             "category":  33,
+                                                             "category":  36,
                                                              "nameResourceKey":  "firewallRules",
                                                              "childSettings":  [
 
@@ -1552,7 +1552,7 @@
                                                              "isSettingDescription":  true,
                                                              "showAsSectionHeader":  false,
                                                              "dataType":  8,
-                                                             "category":  33,
+                                                             "category":  36,
                                                              "nameResourceKey":  "firewallCreateRules",
                                                              "childSettings":  [
 
@@ -1569,7 +1569,7 @@
                                                                              {
                                                                                  "metadata":  {
                                                                                                   "dataType":  20,
-                                                                                                  "category":  33,
+                                                                                                  "category":  36,
                                                                                                   "nameResourceKey":  "firewallRuleName",
                                                                                                   "descriptionResourceKey":  "firewallRuleNameTooltip",
                                                                                                   "emptyValueResourceKey":  "firewallRuleNamePlaceholder",
@@ -1588,7 +1588,7 @@
                                                                              {
                                                                                  "metadata":  {
                                                                                                   "dataType":  20,
-                                                                                                  "category":  33,
+                                                                                                  "category":  36,
                                                                                                   "nameResourceKey":  "firewallRuleDescription",
                                                                                                   "descriptionResourceKey":  "firewallRuleDescriptionTooltip",
                                                                                                   "emptyValueResourceKey":  "firewallRuleDescriptionPlaceholder",
@@ -1607,7 +1607,7 @@
                                                                              {
                                                                                  "metadata":  {
                                                                                                   "dataType":  16,
-                                                                                                  "category":  33,
+                                                                                                  "category":  36,
                                                                                                   "nameResourceKey":  "firewallRuleDirection",
                                                                                                   "descriptionResourceKey":  "firewallRuleDirectionTooltip",
                                                                                                   "childSettings":  [
@@ -1640,7 +1640,7 @@
                                                                              {
                                                                                  "metadata":  {
                                                                                                   "dataType":  16,
-                                                                                                  "category":  33,
+                                                                                                  "category":  36,
                                                                                                   "nameResourceKey":  "firewallRuleAction",
                                                                                                   "descriptionResourceKey":  "firewallRuleActionTooltip",
                                                                                                   "childSettings":  [
@@ -1673,7 +1673,7 @@
                                                                              {
                                                                                  "metadata":  {
                                                                                                   "dataType":  13,
-                                                                                                  "category":  33,
+                                                                                                  "category":  36,
                                                                                                   "nameResourceKey":  "firewallRuleNetworkType",
                                                                                                   "descriptionResourceKey":  "firewallRuleNetworkTypeTooltip",
                                                                                                   "childSettings":  [
@@ -1708,7 +1708,7 @@
                                                                                                   "isSettingDescription":  false,
                                                                                                   "showAsSectionHeader":  false,
                                                                                                   "dataType":  8,
-                                                                                                  "category":  33,
+                                                                                                  "category":  36,
                                                                                                   "nameResourceKey":  "firewallRuleApplicationSettingsHeader",
                                                                                                   "childSettings":  [
 
@@ -1726,7 +1726,7 @@
                                                                                                   "isSettingDescription":  true,
                                                                                                   "showAsSectionHeader":  false,
                                                                                                   "dataType":  8,
-                                                                                                  "category":  33,
+                                                                                                  "category":  36,
                                                                                                   "nameResourceKey":  "firewallRuleApplicationSettingsSubheader",
                                                                                                   "childSettings":  [
 
@@ -1742,7 +1742,7 @@
                                                                              {
                                                                                  "metadata":  {
                                                                                                   "dataType":  16,
-                                                                                                  "category":  33,
+                                                                                                  "category":  36,
                                                                                                   "nameResourceKey":  "firewallRuleApplication",
                                                                                                   "descriptionResourceKey":  "firewallRuleApplicationTooltip",
                                                                                                   "childSettings":  [
@@ -1760,7 +1760,7 @@
                                                                                                                       "children":  [
                                                                                                                                        {
                                                                                                                                            "dataType":  20,
-                                                                                                                                           "category":  33,
+                                                                                                                                           "category":  36,
                                                                                                                                            "nameResourceKey":  "firewallRulePackageFamilyName",
                                                                                                                                            "descriptionResourceKey":  "firewallRulePackageFamilyNameTooltip",
                                                                                                                                            "emptyValueResourceKey":  "firewallRulePackageFamilyNamePlaceholder",
@@ -1784,7 +1784,7 @@
                                                                                                                       "children":  [
                                                                                                                                        {
                                                                                                                                            "dataType":  20,
-                                                                                                                                           "category":  33,
+                                                                                                                                           "category":  36,
                                                                                                                                            "nameResourceKey":  "firewallRuleFileName",
                                                                                                                                            "descriptionResourceKey":  "firewallRuleFileNameTooltip",
                                                                                                                                            "emptyValueResourceKey":  "firewallRuleFileNamePlaceholder",
@@ -1808,7 +1808,7 @@
                                                                                                                       "children":  [
                                                                                                                                        {
                                                                                                                                            "dataType":  20,
-                                                                                                                                           "category":  33,
+                                                                                                                                           "category":  36,
                                                                                                                                            "nameResourceKey":  "firewallRuleServiceName",
                                                                                                                                            "descriptionResourceKey":  "firewallRuleServiceNameTooltip",
                                                                                                                                            "emptyValueResourceKey":  "firewallRuleServiceNamePlaceholder",
@@ -1839,7 +1839,7 @@
                                                                                                   "isSettingDescription":  false,
                                                                                                   "showAsSectionHeader":  false,
                                                                                                   "dataType":  8,
-                                                                                                  "category":  33,
+                                                                                                  "category":  36,
                                                                                                   "nameResourceKey":  "firewallRuleIPAddressSettingsHeader",
                                                                                                   "childSettings":  [
 
@@ -1857,7 +1857,7 @@
                                                                                                   "isSettingDescription":  true,
                                                                                                   "showAsSectionHeader":  false,
                                                                                                   "dataType":  8,
-                                                                                                  "category":  33,
+                                                                                                  "category":  36,
                                                                                                   "nameResourceKey":  "firewallRuleIPAddressSettingsSubheader",
                                                                                                   "childSettings":  [
 
@@ -1873,7 +1873,7 @@
                                                                              {
                                                                                  "metadata":  {
                                                                                                   "dataType":  16,
-                                                                                                  "category":  33,
+                                                                                                  "category":  36,
                                                                                                   "nameResourceKey":  "firewallRuleIPAddressSettingsLocal",
                                                                                                   "descriptionResourceKey":  "firewallRuleIPAddressSettingsLocalTooltip",
                                                                                                   "childSettings":  [
@@ -1891,7 +1891,7 @@
                                                                                                                       "children":  [
                                                                                                                                        {
                                                                                                                                            "dataType":  20,
-                                                                                                                                           "category":  33,
+                                                                                                                                           "category":  36,
                                                                                                                                            "nameResourceKey":  "firewallRuleIPAddressSettingsAddresses",
                                                                                                                                            "emptyValueResourceKey":  "firewallRuleIPAddressSettingsLocalPlaceholder",
                                                                                                                                            "childSettings":  [
@@ -1919,7 +1919,7 @@
                                                                              {
                                                                                  "metadata":  {
                                                                                                   "dataType":  16,
-                                                                                                  "category":  33,
+                                                                                                  "category":  36,
                                                                                                   "nameResourceKey":  "firewallRuleIPAddressSettingsRemote",
                                                                                                   "descriptionResourceKey":  "firewallRuleIPAddressSettingsRemoteTooltip",
                                                                                                   "childSettings":  [
@@ -1937,7 +1937,7 @@
                                                                                                                       "children":  [
                                                                                                                                        {
                                                                                                                                            "dataType":  20,
-                                                                                                                                           "category":  33,
+                                                                                                                                           "category":  36,
                                                                                                                                            "nameResourceKey":  "firewallRuleIPAddressSettingsAddresses",
                                                                                                                                            "emptyValueResourceKey":  "firewallRuleIPAddressSettingsRemotePlaceholder",
                                                                                                                                            "childSettings":  [
@@ -1967,7 +1967,7 @@
                                                                                                   "isSettingDescription":  false,
                                                                                                   "showAsSectionHeader":  false,
                                                                                                   "dataType":  8,
-                                                                                                  "category":  33,
+                                                                                                  "category":  36,
                                                                                                   "nameResourceKey":  "firewallRulePortAndProtocolHeader",
                                                                                                   "childSettings":  [
 
@@ -1985,7 +1985,7 @@
                                                                                                   "isSettingDescription":  true,
                                                                                                   "showAsSectionHeader":  false,
                                                                                                   "dataType":  8,
-                                                                                                  "category":  33,
+                                                                                                  "category":  36,
                                                                                                   "nameResourceKey":  "firewallRulePortAndProtocolSubheader",
                                                                                                   "childSettings":  [
 
@@ -2001,7 +2001,7 @@
                                                                              {
                                                                                  "metadata":  {
                                                                                                   "dataType":  16,
-                                                                                                  "category":  33,
+                                                                                                  "category":  36,
                                                                                                   "nameResourceKey":  "firewallRuleProtocolSetting",
                                                                                                   "descriptionResourceKey":  "firewallRuleProtocolTooltip",
                                                                                                   "childSettings":  [
@@ -2019,7 +2019,7 @@
                                                                                                                       "children":  [
                                                                                                                                        {
                                                                                                                                            "dataType":  16,
-                                                                                                                                           "category":  33,
+                                                                                                                                           "category":  36,
                                                                                                                                            "nameResourceKey":  "firewallRuleLocalPortsSetting",
                                                                                                                                            "descriptionResourceKey":  "firewallRulePortSettingTooltip",
                                                                                                                                            "childSettings":  [
@@ -2037,7 +2037,7 @@
                                                                                                                                                                "children":  [
                                                                                                                                                                                 {
                                                                                                                                                                                     "dataType":  20,
-                                                                                                                                                                                    "category":  33,
+                                                                                                                                                                                    "category":  36,
                                                                                                                                                                                     "nameResourceKey":  "firewallRulePortsLabel",
                                                                                                                                                                                     "emptyValueResourceKey":  "firewallRuleLocalPortsPlaceholder",
                                                                                                                                                                                     "childSettings":  [
@@ -2063,7 +2063,7 @@
                                                                                                                                        },
                                                                                                                                        {
                                                                                                                                            "dataType":  16,
-                                                                                                                                           "category":  33,
+                                                                                                                                           "category":  36,
                                                                                                                                            "nameResourceKey":  "firewallRuleRemotePortsSetting",
                                                                                                                                            "descriptionResourceKey":  "firewallRulePortSettingTooltip",
                                                                                                                                            "childSettings":  [
@@ -2081,7 +2081,7 @@
                                                                                                                                                                "children":  [
                                                                                                                                                                                 {
                                                                                                                                                                                     "dataType":  20,
-                                                                                                                                                                                    "category":  33,
+                                                                                                                                                                                    "category":  36,
                                                                                                                                                                                     "nameResourceKey":  "firewallRulePortsLabel",
                                                                                                                                                                                     "emptyValueResourceKey":  "firewallRuleRemotePortsPlaceholder",
                                                                                                                                                                                     "childSettings":  [
@@ -2114,7 +2114,7 @@
                                                                                                                       "children":  [
                                                                                                                                        {
                                                                                                                                            "dataType":  16,
-                                                                                                                                           "category":  33,
+                                                                                                                                           "category":  36,
                                                                                                                                            "nameResourceKey":  "firewallRuleLocalPortsSetting",
                                                                                                                                            "descriptionResourceKey":  "firewallRulePortSettingTooltip",
                                                                                                                                            "childSettings":  [
@@ -2132,7 +2132,7 @@
                                                                                                                                                                "children":  [
                                                                                                                                                                                 {
                                                                                                                                                                                     "dataType":  20,
-                                                                                                                                                                                    "category":  33,
+                                                                                                                                                                                    "category":  36,
                                                                                                                                                                                     "nameResourceKey":  "firewallRulePortsLabel",
                                                                                                                                                                                     "emptyValueResourceKey":  "firewallRuleLocalPortsPlaceholder",
                                                                                                                                                                                     "childSettings":  [
@@ -2158,7 +2158,7 @@
                                                                                                                                        },
                                                                                                                                        {
                                                                                                                                            "dataType":  16,
-                                                                                                                                           "category":  33,
+                                                                                                                                           "category":  36,
                                                                                                                                            "nameResourceKey":  "firewallRuleRemotePortsSetting",
                                                                                                                                            "descriptionResourceKey":  "firewallRulePortSettingTooltip",
                                                                                                                                            "childSettings":  [
@@ -2176,7 +2176,7 @@
                                                                                                                                                                "children":  [
                                                                                                                                                                                 {
                                                                                                                                                                                     "dataType":  20,
-                                                                                                                                                                                    "category":  33,
+                                                                                                                                                                                    "category":  36,
                                                                                                                                                                                     "nameResourceKey":  "firewallRulePortsLabel",
                                                                                                                                                                                     "emptyValueResourceKey":  "firewallRuleRemotePortsPlaceholder",
                                                                                                                                                                                     "childSettings":  [
@@ -2209,7 +2209,7 @@
                                                                                                                       "children":  [
                                                                                                                                        {
                                                                                                                                            "dataType":  14,
-                                                                                                                                           "category":  33,
+                                                                                                                                           "category":  36,
                                                                                                                                            "nameResourceKey":  "firewallRuleProtocolSetting",
                                                                                                                                            "emptyValueResourceKey":  "firewallRuleProtocolPlaceholder",
                                                                                                                                            "childSettings":  [
@@ -2239,7 +2239,7 @@
                                                                                                   "isSettingDescription":  false,
                                                                                                   "showAsSectionHeader":  false,
                                                                                                   "dataType":  8,
-                                                                                                  "category":  33,
+                                                                                                  "category":  36,
                                                                                                   "nameResourceKey":  "firewallRuleAdvancedConfigurationHeader",
                                                                                                   "childSettings":  [
 
@@ -2255,7 +2255,7 @@
                                                                              {
                                                                                  "metadata":  {
                                                                                                   "dataType":  13,
-                                                                                                  "category":  33,
+                                                                                                  "category":  36,
                                                                                                   "nameResourceKey":  "firewallRuleInterfaceTypesSetting",
                                                                                                   "descriptionResourceKey":  "firewallRuleInterfaceTypesTooltip",
                                                                                                   "childSettings":  [
@@ -2290,7 +2290,7 @@
                                                                                                   "isSettingDescription":  true,
                                                                                                   "showAsSectionHeader":  false,
                                                                                                   "dataType":  8,
-                                                                                                  "category":  33,
+                                                                                                  "category":  36,
                                                                                                   "nameResourceKey":  "firewallRuleAuthorizedUsersHeader",
                                                                                                   "childSettings":  [
 
@@ -2306,7 +2306,7 @@
                                                                              {
                                                                                  "metadata":  {
                                                                                                   "dataType":  12,
-                                                                                                  "category":  33,
+                                                                                                  "category":  36,
                                                                                                   "nameResourceKey":  "firewallRuleAuthorizedUsersSubheader",
                                                                                                   "descriptionResourceKey":  "firewallRuleAuthorizedUsersHeaderTooltip",
                                                                                                   "emptyValueResourceKey":  "firewallRuleAuthorizedUsersPlaceholder",
@@ -2324,7 +2324,7 @@
                                                                              }
                                                                          ],
                                                              "dataType":  21,
-                                                             "category":  33,
+                                                             "category":  36,
                                                              "nameResourceKey":  "empty",
                                                              "childSettings":  [
 

Documentation/ObjectInfo/defenderlocalsecurityoptions_windows10endpointprotection.json

@@ -4,7 +4,7 @@
                                                                          "complexOptions":  [
                                                                                                 {
                                                                                                     "dataType":  19,
-                                                                                                    "category":  32,
+                                                                                                    "category":  35,
                                                                                                     "nameResourceKey":  "localSecurityOptionsBlockMicrosoftAccountsName",
                                                                                                     "descriptionResourceKey":  "localSecurityOptionsBlockMicrosoftAccountsDesc",
                                                                                                     "childSettings":  [
@@ -31,7 +31,7 @@
                                                                                                 },
                                                                                                 {
                                                                                                     "dataType":  19,
-                                                                                                    "category":  32,
+                                                                                                    "category":  35,
                                                                                                     "nameResourceKey":  "localSecurityOptionsBlockRemoteLogonWithBlankPasswordName",
                                                                                                     "descriptionResourceKey":  "localSecurityOptionsBlockRemoteLogonWithBlankPasswordDesc",
                                                                                                     "childSettings":  [
@@ -60,7 +60,7 @@
                                                                                                     "isSettingDescription":  false,
                                                                                                     "showAsSectionHeader":  false,
                                                                                                     "dataType":  8,
-                                                                                                    "category":  32,
+                                                                                                    "category":  35,
                                                                                                     "nameResourceKey":  "localSecurityOptionsAdminText",
                                                                                                     "childSettings":  [
 
@@ -74,7 +74,7 @@
                                                                                                 },
                                                                                                 {
                                                                                                     "dataType":  19,
-                                                                                                    "category":  32,
+                                                                                                    "category":  35,
                                                                                                     "nameResourceKey":  "localSecurityOptionsEnableAdministratorAccountName",
                                                                                                     "descriptionResourceKey":  "localSecurityOptionsEnableAdministratorAccountDesc",
                                                                                                     "childSettings":  [
@@ -101,7 +101,7 @@
                                                                                                 },
                                                                                                 {
                                                                                                     "dataType":  20,
-                                                                                                    "category":  32,
+                                                                                                    "category":  35,
                                                                                                     "nameResourceKey":  "localSecurityOptionsAdministratorAccountNameName",
                                                                                                     "descriptionResourceKey":  "localSecurityOptionsAdministratorAccountNameDesc",
                                                                                                     "emptyValueResourceKey":  "localSecurityOptionsAdminPlaceholder",
@@ -121,7 +121,7 @@
                                                                                                     "isSettingDescription":  false,
                                                                                                     "showAsSectionHeader":  false,
                                                                                                     "dataType":  8,
-                                                                                                    "category":  32,
+                                                                                                    "category":  35,
                                                                                                     "nameResourceKey":  "localSecurityOptionsGuestText",
                                                                                                     "childSettings":  [
 
@@ -135,7 +135,7 @@
                                                                                                 },
                                                                                                 {
                                                                                                     "dataType":  19,
-                                                                                                    "category":  32,
+                                                                                                    "category":  35,
                                                                                                     "nameResourceKey":  "localSecurityOptionsEnableGuestAccountName",
                                                                                                     "descriptionResourceKey":  "localSecurityOptionsEnableGuestAccountDesc",
                                                                                                     "childSettings":  [
@@ -162,7 +162,7 @@
                                                                                                 },
                                                                                                 {
                                                                                                     "dataType":  20,
-                                                                                                    "category":  32,
+                                                                                                    "category":  35,
                                                                                                     "nameResourceKey":  "localSecurityOptionsGuestAccountNameName",
                                                                                                     "descriptionResourceKey":  "localSecurityOptionsGuestAccountNameDesc",
                                                                                                     "emptyValueResourceKey":  "localSecurityOptionsGuestPlaceholder",
@@ -180,7 +180,7 @@
                                                                                                 }
                                                                                             ],
                                                                          "dataType":  5,
-                                                                         "category":  32,
+                                                                         "category":  35,
                                                                          "nameResourceKey":  "localSecurityOptionsAccountsChevronName",
                                                                          "childSettings":  [
 
@@ -196,7 +196,7 @@
                                                                          "complexOptions":  [
                                                                                                 {
                                                                                                     "dataType":  19,
-                                                                                                    "category":  32,
+                                                                                                    "category":  35,
                                                                                                     "nameResourceKey":  "localSecurityOptionsAllowUndockWithoutHavingToLogonName",
                                                                                                     "descriptionResourceKey":  "localSecurityOptionsAllowUndockWithoutHavingToLogonDesc",
                                                                                                     "childSettings":  [
@@ -223,7 +223,7 @@
                                                                                                 },
                                                                                                 {
                                                                                                     "dataType":  19,
-                                                                                                    "category":  32,
+                                                                                                    "category":  35,
                                                                                                     "nameResourceKey":  "localSecurityOptionsBlockUsersInstallingPrinterDriversName",
                                                                                                     "descriptionResourceKey":  "localSecurityOptionsBlockUsersInstallingPrinterDriversDesc",
                                                                                                     "childSettings":  [
@@ -250,7 +250,7 @@
                                                                                                 },
                                                                                                 {
                                                                                                     "dataType":  19,
-                                                                                                    "category":  32,
+                                                                                                    "category":  35,
                                                                                                     "nameResourceKey":  "localSecurityOptionsBlockRemoteOpticalDriveAccessName",
                                                                                                     "descriptionResourceKey":  "localSecurityOptionsBlockRemoteOpticalDriveAccessDesc",
                                                                                                     "childSettings":  [
@@ -277,7 +277,7 @@
                                                                                                 },
                                                                                                 {
                                                                                                     "dataType":  16,
-                                                                                                    "category":  32,
+                                                                                                    "category":  35,
                                                                                                     "nameResourceKey":  "localSecurityOptionsFormatAndEjectOfRemovableMediaAllowedUserName",
                                                                                                     "descriptionResourceKey":  "localSecurityOptionsFormatAndEjectOfRemovableMediaAllowedUserDesc",
                                                                                                     "childSettings":  [
@@ -314,7 +314,7 @@
                                                                                                 }
                                                                                             ],
                                                                          "dataType":  5,
-                                                                         "category":  32,
+                                                                         "category":  35,
                                                                          "nameResourceKey":  "localSecurityOptionsDevicesChevronName",
                                                                          "childSettings":  [
 
@@ -330,7 +330,7 @@
                                                                          "complexOptions":  [
                                                                                                 {
                                                                                                     "dataType":  14,
-                                                                                                    "category":  32,
+                                                                                                    "category":  35,
                                                                                                     "nameResourceKey":  "localSecurityOptionsMachineInactivityLimitName",
                                                                                                     "descriptionResourceKey":  "localSecurityOptionsMachineInactivityLimitDesc",
                                                                                                     "emptyValueResourceKey":  "localSecurityOptionsMachineInactivityLimitPlaceholderText",
@@ -348,7 +348,7 @@
                                                                                                 },
                                                                                                 {
                                                                                                     "dataType":  19,
-                                                                                                    "category":  32,
+                                                                                                    "category":  35,
                                                                                                     "nameResourceKey":  "localSecurityOptionsDoNotRequireCtrlAltDelName",
                                                                                                     "descriptionResourceKey":  "localSecurityOptionsDoNotRequireCtrlAltDelDesc",
                                                                                                     "childSettings":  [
@@ -375,7 +375,7 @@
                                                                                                 },
                                                                                                 {
                                                                                                     "dataType":  16,
-                                                                                                    "category":  32,
+                                                                                                    "category":  35,
                                                                                                     "nameResourceKey":  "localSecurityOptionsSmartCardRemovalBehaviorName",
                                                                                                     "descriptionResourceKey":  "localSecurityOptionsSmartCardRemovalBehaviorDesc",
                                                                                                     "childSettings":  [
@@ -383,13 +383,13 @@
                                                                                                                       ],
                                                                                                     "options":  [
                                                                                                                     {
-                                                                                                                        "nameResourceKey":  "localSecurityOptionsSmartCardRemovalBehaviorLockWorkstation",
+                                                                                                                        "nameResourceKey":  "localSecurityOptionsSmartCardRemovalBehaviorNoAction",
-                                                                                                                        "value":  "lockWorkstation",
+                                                                                                                        "value":  "noAction",
                                                                                                                         "enabled":  true
                                                                                                                     },
                                                                                                                     {
-                                                                                                                        "nameResourceKey":  "localSecurityOptionsSmartCardRemovalBehaviorNoAction",
+                                                                                                                        "nameResourceKey":  "localSecurityOptionsSmartCardRemovalBehaviorLockWorkstation",
-                                                                                                                        "value":  "noAction",
+                                                                                                                        "value":  "lockWorkstation",
                                                                                                                         "enabled":  true
                                                                                                                     },
                                                                                                                     {
@@ -405,8 +405,8 @@
                                                                                                                 ],
                                                                                                     "entityKey":  "localSecurityOptionsSmartCardRemovalBehavior",
                                                                                                     "booleanActions":  0,
-                                                                                                    "defaultValue":  "lockWorkstation",
+                                                                                                    "defaultValue":  "noAction",
-                                                                                                    "unconfiguredValue":  "lockWorkstation",
+                                                                                                    "unconfiguredValue":  "noAction",
                                                                                                     "policyType":  77,
                                                                                                     "enabled":  true
                                                                                                 },
@@ -414,7 +414,7 @@
                                                                                                     "isSettingDescription":  false,
                                                                                                     "showAsSectionHeader":  false,
                                                                                                     "dataType":  8,
-                                                                                                    "category":  32,
+                                                                                                    "category":  35,
                                                                                                     "nameResourceKey":  "localSecurityOptionsDisplayText",
                                                                                                     "childSettings":  [
 
@@ -428,7 +428,7 @@
                                                                                                 },
                                                                                                 {
                                                                                                     "dataType":  16,
-                                                                                                    "category":  32,
+                                                                                                    "category":  35,
                                                                                                     "nameResourceKey":  "localSecurityOptionsInformationShownOnLockScreenName",
                                                                                                     "descriptionResourceKey":  "localSecurityOptionsInformationShownOnLockScreenDesc",
                                                                                                     "childSettings":  [
@@ -465,7 +465,7 @@
                                                                                                 },
                                                                                                 {
                                                                                                     "dataType":  19,
-                                                                                                    "category":  32,
+                                                                                                    "category":  35,
                                                                                                     "nameResourceKey":  "localSecurityOptionsHideLastSignedInUserName",
                                                                                                     "descriptionResourceKey":  "localSecurityOptionsHideLastSignedInUserDesc",
                                                                                                     "childSettings":  [
@@ -492,7 +492,7 @@
                                                                                                 },
                                                                                                 {
                                                                                                     "dataType":  19,
-                                                                                                    "category":  32,
+                                                                                                    "category":  35,
                                                                                                     "nameResourceKey":  "localSecurityOptionsHideUsernameAtSignInName",
                                                                                                     "descriptionResourceKey":  "localSecurityOptionsHideUsernameAtSignInDesc",
                                                                                                     "childSettings":  [
@@ -519,7 +519,7 @@
                                                                                                 },
                                                                                                 {
                                                                                                     "dataType":  20,
-                                                                                                    "category":  32,
+                                                                                                    "category":  35,
                                                                                                     "nameResourceKey":  "localSecurityOptionsLogOnMessageTitleName",
                                                                                                     "descriptionResourceKey":  "localSecurityOptionsLogOnMessageTitleDesc",
                                                                                                     "emptyValueResourceKey":  "localSecurityOptionsLogOnMessageTitlePlaceholder",
@@ -537,7 +537,7 @@
                                                                                                 },
                                                                                                 {
                                                                                                     "dataType":  20,
-                                                                                                    "category":  32,
+                                                                                                    "category":  35,
                                                                                                     "nameResourceKey":  "localSecurityOptionsLogOnMessageTextName",
                                                                                                     "descriptionResourceKey":  "localSecurityOptionsLogOnMessageTextDesc",
                                                                                                     "emptyValueResourceKey":  "localSecurityOptionsLogOnMessageTextPlaceholder",
@@ -555,7 +555,7 @@
                                                                                                 }
                                                                                             ],
                                                                          "dataType":  5,
-                                                                         "category":  32,
+                                                                         "category":  35,
                                                                          "nameResourceKey":  "localSecurityOptionsInteractiveLogonChevronName",
                                                                          "childSettings":  [
 
@@ -571,7 +571,7 @@
                                                                          "complexOptions":  [
                                                                                                 {
                                                                                                     "dataType":  19,
-                                                                                                    "category":  32,
+                                                                                                    "category":  35,
                                                                                                     "nameResourceKey":  "localSecurityOptionsRestrictAnonymousAccessToNamedPipesAndSharesName",
                                                                                                     "descriptionResourceKey":  "localSecurityOptionsRestrictAnonymousAccessToNamedPipesAndSharesDesc",
                                                                                                     "childSettings":  [
@@ -598,7 +598,7 @@
                                                                                                 },
                                                                                                 {
                                                                                                     "dataType":  19,
-                                                                                                    "category":  32,
+                                                                                                    "category":  35,
                                                                                                     "nameResourceKey":  "localSecurityOptionsDoNotAllowAnonymousEnumerationOfSAMAccountsName",
                                                                                                     "descriptionResourceKey":  "localSecurityOptionsDoNotAllowAnonymousEnumerationOfSAMAccountsDesc",
                                                                                                     "childSettings":  [
@@ -625,7 +625,7 @@
                                                                                                 },
                                                                                                 {
                                                                                                     "dataType":  19,
-                                                                                                    "category":  32,
+                                                                                                    "category":  35,
                                                                                                     "nameResourceKey":  "localSecurityOptionsAllowAnonymousEnumerationOfSAMAccountsAndSharesName",
                                                                                                     "descriptionResourceKey":  "localSecurityOptionsAllowAnonymousEnumerationOfSAMAccountsAndSharesDesc",
                                                                                                     "childSettings":  [
@@ -652,7 +652,7 @@
                                                                                                 },
                                                                                                 {
                                                                                                     "dataType":  19,
-                                                                                                    "category":  32,
+                                                                                                    "category":  35,
                                                                                                     "nameResourceKey":  "localSecurityOptionsDoNotStoreLANManagerHashValueOnNextPasswordChangeName",
                                                                                                     "descriptionResourceKey":  "localSecurityOptionsDoNotStoreLANManagerHashValueOnNextPasswordChangeDesc",
                                                                                                     "childSettings":  [
@@ -679,7 +679,7 @@
                                                                                                 },
                                                                                                 {
                                                                                                     "dataType":  19,
-                                                                                                    "category":  32,
+                                                                                                    "category":  35,
                                                                                                     "nameResourceKey":  "localSecurityOptionsAllowPKU2UAuthenticationRequestsName",
                                                                                                     "descriptionResourceKey":  "localSecurityOptionsAllowPKU2UAuthenticationRequestsDesc",
                                                                                                     "childSettings":  [
@@ -706,13 +706,13 @@
                                                                                                 },
                                                                                                 {
                                                                                                     "dataType":  0,
-                                                                                                    "category":  32,
+                                                                                                    "category":  35,
                                                                                                     "nameResourceKey":  "localSecurityOptionsAllowRemoteCallsToSecurityAccountsManagerSwitchName",
                                                                                                     "descriptionResourceKey":  "localSecurityOptionsAllowRemoteCallsToSecurityAccountsManagerSwitchDesc",
                                                                                                     "childSettings":  [
                                                                                                                           {
                                                                                                                               "dataType":  20,
-                                                                                                                              "category":  32,
+                                                                                                                              "category":  35,
                                                                                                                               "nameResourceKey":  "localSecurityOptionsAllowRemoteCallsToSecurityAccountsManagerName",
                                                                                                                               "emptyValueResourceKey":  "localSecurityOptionsAllowRemoteCallsToSecurityAccountsManagerTextPlaceholder",
                                                                                                                               "childSettings":  [
@@ -749,7 +749,7 @@
                                                                                                 },
                                                                                                 {
                                                                                                     "dataType":  16,
-                                                                                                    "category":  32,
+                                                                                                    "category":  35,
                                                                                                     "nameResourceKey":  "localSecurityOptionsMinimumSessionSecurityForNtlmSspBasedClientsName",
                                                                                                     "descriptionResourceKey":  "localSecurityOptionsMinimumSessionSecurityForNtlmSspBasedClientsDesc",
                                                                                                     "childSettings":  [
@@ -786,7 +786,7 @@
                                                                                                 },
                                                                                                 {
                                                                                                     "dataType":  16,
-                                                                                                    "category":  32,
+                                                                                                    "category":  35,
                                                                                                     "nameResourceKey":  "localSecurityOptionsMinimumSessionSecurityForNtlmSspBasedServersName",
                                                                                                     "descriptionResourceKey":  "localSecurityOptionsMinimumSessionSecurityForNtlmSspBasedServersDesc",
                                                                                                     "childSettings":  [
@@ -823,7 +823,7 @@
                                                                                                 },
                                                                                                 {
                                                                                                     "dataType":  16,
-                                                                                                    "category":  32,
+                                                                                                    "category":  35,
                                                                                                     "nameResourceKey":  "lanManagerAuthenticationLevelName",
                                                                                                     "descriptionResourceKey":  "lanManagerAuthenticationLevelDesc",
                                                                                                     "childSettings":  [
@@ -870,7 +870,7 @@
                                                                                                 },
                                                                                                 {
                                                                                                     "dataType":  19,
-                                                                                                    "category":  32,
+                                                                                                    "category":  35,
                                                                                                     "nameResourceKey":  "lanManagerWorkstationEnableInsecureGuestLogonsName",
                                                                                                     "descriptionResourceKey":  "lanManagerWorkstationDisableInsecureGuestLogonsDesc",
                                                                                                     "childSettings":  [
@@ -897,7 +897,7 @@
                                                                                                 }
                                                                                             ],
                                                                          "dataType":  5,
-                                                                         "category":  32,
+                                                                         "category":  35,
                                                                          "nameResourceKey":  "localSecurityOptionsNetworkAccessAndSecurityChevronName",
                                                                          "childSettings":  [
 
@@ -913,7 +913,7 @@
                                                                          "complexOptions":  [
                                                                                                 {
                                                                                                     "dataType":  19,
-                                                                                                    "category":  32,
+                                                                                                    "category":  35,
                                                                                                     "nameResourceKey":  "localSecurityOptionsClearVirtualMemoryPageFileName",
                                                                                                     "descriptionResourceKey":  "localSecurityOptionsClearVirtualMemoryPageFileDesc",
                                                                                                     "childSettings":  [
@@ -940,7 +940,7 @@
                                                                                                 },
                                                                                                 {
                                                                                                     "dataType":  19,
-                                                                                                    "category":  32,
+                                                                                                    "category":  35,
                                                                                                     "nameResourceKey":  "localSecurityOptionsAllowSystemToBeShutDownWithoutHavingToLogOnName",
                                                                                                     "descriptionResourceKey":  "localSecurityOptionsAllowSystemToBeShutDownWithoutHavingToLogOnDesc",
                                                                                                     "childSettings":  [
@@ -967,7 +967,7 @@
                                                                                                 }
                                                                                             ],
                                                                          "dataType":  5,
-                                                                         "category":  32,
+                                                                         "category":  35,
                                                                          "nameResourceKey":  "localSecurityOptionsRecoveryConsoleAndShutdownChevronName",
                                                                          "childSettings":  [
 
@@ -983,7 +983,7 @@
                                                                          "complexOptions":  [
                                                                                                 {
                                                                                                     "dataType":  19,
-                                                                                                    "category":  32,
+                                                                                                    "category":  35,
                                                                                                     "nameResourceKey":  "localSecurityOptionsAllowUIAccessApplicationElevationName",
                                                                                                     "descriptionResourceKey":  "localSecurityOptionsAllowUIAccessApplicationElevationDesc",
                                                                                                     "childSettings":  [
@@ -1010,7 +1010,7 @@
                                                                                                 },
                                                                                                 {
                                                                                                     "dataType":  19,
-                                                                                                    "category":  32,
+                                                                                                    "category":  35,
                                                                                                     "nameResourceKey":  "localSecurityOptionsVirtualizeFileAndRegistryWriteFailuresToPerUserLocationsName",
                                                                                                     "descriptionResourceKey":  "localSecurityOptionsVirtualizeFileAndRegistryWriteFailuresToPerUserLocationsDesc",
                                                                                                     "childSettings":  [
@@ -1037,7 +1037,7 @@
                                                                                                 },
                                                                                                 {
                                                                                                     "dataType":  19,
-                                                                                                    "category":  32,
+                                                                                                    "category":  35,
                                                                                                     "nameResourceKey":  "localSecurityOptionsOnlyElevateSignedExecutablesName",
                                                                                                     "descriptionResourceKey":  "localSecurityOptionsOnlyElevateSignedExecutablesDesc",
                                                                                                     "childSettings":  [
@@ -1066,7 +1066,7 @@
                                                                                                     "isSettingDescription":  false,
                                                                                                     "showAsSectionHeader":  false,
                                                                                                     "dataType":  8,
-                                                                                                    "category":  32,
+                                                                                                    "category":  35,
                                                                                                     "nameResourceKey":  "localSecurityOptionsUIAElevationPromptText",
                                                                                                     "childSettings":  [
 
@@ -1080,7 +1080,7 @@
                                                                                                 },
                                                                                                 {
                                                                                                     "dataType":  16,
-                                                                                                    "category":  32,
+                                                                                                    "category":  35,
                                                                                                     "nameResourceKey":  "localSecurityOptionsAdministratorElevationPromptBehaviorName",
                                                                                                     "descriptionResourceKey":  "localSecurityOptionsAdministratorElevationPromptBehaviorDesc",
                                                                                                     "childSettings":  [
@@ -1132,7 +1132,7 @@
                                                                                                 },
                                                                                                 {
                                                                                                     "dataType":  16,
-                                                                                                    "category":  32,
+                                                                                                    "category":  35,
                                                                                                     "nameResourceKey":  "localSecurityOptionsStandardUserElevationPromptBehaviorName",
                                                                                                     "descriptionResourceKey":  "localSecurityOptionsStandardUserElevationPromptBehaviorDesc",
                                                                                                     "childSettings":  [
@@ -1169,7 +1169,7 @@
                                                                                                 },
                                                                                                 {
                                                                                                     "dataType":  19,
-                                                                                                    "category":  32,
+                                                                                                    "category":  35,
                                                                                                     "nameResourceKey":  "localSecurityOptionsSwitchToSecureDesktopWhenPromptingForElevationName",
                                                                                                     "descriptionResourceKey":  "localSecurityOptionsSwitchToSecureDesktopWhenPromptingForElevationDesc",
                                                                                                     "childSettings":  [
@@ -1196,7 +1196,7 @@
                                                                                                 },
                                                                                                 {
                                                                                                     "dataType":  19,
-                                                                                                    "category":  32,
+                                                                                                    "category":  35,
                                                                                                     "nameResourceKey":  "localSecurityOptionsDetectApplicationInstallationsAndPromptForElevationName",
                                                                                                     "descriptionResourceKey":  "localSecurityOptionsDetectApplicationInstallationsAndPromptForElevationDesc",
                                                                                                     "childSettings":  [
@@ -1223,7 +1223,7 @@
                                                                                                 },
                                                                                                 {
                                                                                                     "dataType":  19,
-                                                                                                    "category":  32,
+                                                                                                    "category":  35,
                                                                                                     "nameResourceKey":  "localSecurityOptionsAllowUIAccessApplicationsForSecureLocationsName",
                                                                                                     "descriptionResourceKey":  "localSecurityOptionsAllowUIAccessApplicationsForSecureLocationsDesc",
                                                                                                     "childSettings":  [
@@ -1252,7 +1252,7 @@
                                                                                                     "isSettingDescription":  false,
                                                                                                     "showAsSectionHeader":  false,
                                                                                                     "dataType":  8,
-                                                                                                    "category":  32,
+                                                                                                    "category":  35,
                                                                                                     "nameResourceKey":  "localSecurityOptionsAdminApprovalModeText",
                                                                                                     "childSettings":  [
 
@@ -1266,7 +1266,7 @@
                                                                                                 },
                                                                                                 {
                                                                                                     "dataType":  19,
-                                                                                                    "category":  32,
+                                                                                                    "category":  35,
                                                                                                     "nameResourceKey":  "localSecurityOptionsUseAdminApprovalModeName",
                                                                                                     "descriptionResourceKey":  "localSecurityOptionsUseAdminApprovalModeDesc",
                                                                                                     "childSettings":  [
@@ -1293,7 +1293,7 @@
                                                                                                 },
                                                                                                 {
                                                                                                     "dataType":  19,
-                                                                                                    "category":  32,
+                                                                                                    "category":  35,
                                                                                                     "nameResourceKey":  "localSecurityOptionsUseAdminApprovalModeForAdministratorsName",
                                                                                                     "descriptionResourceKey":  "localSecurityOptionsUseAdminApprovalModeForAdministratorsDesc",
                                                                                                     "childSettings":  [
@@ -1320,7 +1320,7 @@
                                                                                                 }
                                                                                             ],
                                                                          "dataType":  5,
-                                                                         "category":  32,
+                                                                         "category":  35,
                                                                          "nameResourceKey":  "localSecurityOptionsUserAccountControlChevronName",
                                                                          "childSettings":  [
 
@@ -1336,7 +1336,7 @@
                                                                          "complexOptions":  [
                                                                                                 {
                                                                                                     "dataType":  19,
-                                                                                                    "category":  32,
+                                                                                                    "category":  35,
                                                                                                     "nameResourceKey":  "localSecurityOptionsDisableClientDigitallySignCommunicationsIfServerAgreesName",
                                                                                                     "descriptionResourceKey":  "localSecurityOptionsDisableClientDigitallySignCommunicationsIfServerAgreesDesc",
                                                                                                     "childSettings":  [
@@ -1363,7 +1363,7 @@
                                                                                                 },
                                                                                                 {
                                                                                                     "dataType":  19,
-                                                                                                    "category":  32,
+                                                                                                    "category":  35,
                                                                                                     "nameResourceKey":  "localSecurityOptionsClientSendUnencryptedPasswordToThirdPartySMBServersName",
                                                                                                     "descriptionResourceKey":  "localSecurityOptionsClientSendUnencryptedPasswordToThirdPartySMBServersDesc",
                                                                                                     "childSettings":  [
@@ -1390,7 +1390,7 @@
                                                                                                 },
                                                                                                 {
                                                                                                     "dataType":  19,
-                                                                                                    "category":  32,
+                                                                                                    "category":  35,
                                                                                                     "nameResourceKey":  "localSecurityOptionsClientDigitallySignCommunicationsAlwaysName",
                                                                                                     "descriptionResourceKey":  "localSecurityOptionsClientDigitallySignCommunicationsAlwaysDesc",
                                                                                                     "childSettings":  [
@@ -1417,7 +1417,7 @@
                                                                                                 }
                                                                                             ],
                                                                          "dataType":  5,
-                                                                         "category":  32,
+                                                                         "category":  35,
                                                                          "nameResourceKey":  "localSecurityOptionsMicrosoftNetworkClientName",
                                                                          "childSettings":  [
 
@@ -1433,7 +1433,7 @@
                                                                          "complexOptions":  [
                                                                                                 {
                                                                                                     "dataType":  19,
-                                                                                                    "category":  32,
+                                                                                                    "category":  35,
                                                                                                     "nameResourceKey":  "localSecurityOptionsDisableServerDigitallySignCommunicationsIfClientAgreesName",
                                                                                                     "descriptionResourceKey":  "localSecurityOptionsDisableServerDigitallySignCommunicationsIfClientAgreesDesc",
                                                                                                     "childSettings":  [
@@ -1460,7 +1460,7 @@
                                                                                                 },
                                                                                                 {
                                                                                                     "dataType":  19,
-                                                                                                    "category":  32,
+                                                                                                    "category":  35,
                                                                                                     "nameResourceKey":  "localSecurityOptionsDisableServerDigitallySignCommunicationsAlwaysName",
                                                                                                     "descriptionResourceKey":  "localSecurityOptionsDisableServerDigitallySignCommunicationsAlwaysDesc",
                                                                                                     "childSettings":  [
@@ -1487,7 +1487,7 @@
                                                                                                 }
                                                                                             ],
                                                                          "dataType":  5,
-                                                                         "category":  32,
+                                                                         "category":  35,
                                                                          "nameResourceKey":  "localSecurityOptionsMicrosoftNetworkServerName",
                                                                          "childSettings":  [
 

Documentation/ObjectInfo/defendersecuritycenter_windows10endpointprotection.json

@@ -4,7 +4,7 @@
                                                                    "isSettingDescription":  false,
                                                                    "showAsSectionHeader":  false,
                                                                    "dataType":  8,
-                                                                   "category":  31,
+                                                                   "category":  34,
                                                                    "nameResourceKey":  "defenderSecurityCenterHeaderText",
                                                                    "childSettings":  [
 
@@ -20,7 +20,7 @@
                                                                    "isSettingDescription":  true,
                                                                    "showAsSectionHeader":  false,
                                                                    "dataType":  8,
-                                                                   "category":  31,
+                                                                   "category":  34,
                                                                    "nameResourceKey":  "defenderSecurityCenterSubHeaderText",
                                                                    "childSettings":  [
 
@@ -34,13 +34,13 @@
                                                                },
                                                                {
                                                                    "dataType":  16,
-                                                                   "category":  31,
+                                                                   "category":  34,
                                                                    "nameResourceKey":  "defenderSecurityCenterDisableVirusUIName",
                                                                    "descriptionResourceKey":  "defenderSecurityCenterDisableVirusUIDescription",
                                                                    "childSettings":  [
                                                                                          {
                                                                                              "dataType":  16,
-                                                                                             "category":  31,
+                                                                                             "category":  34,
                                                                                              "nameResourceKey":  "defenderSecurityCenterDisableRansomwareUIName",
                                                                                              "descriptionResourceKey":  "defenderSecurityCenterDisableRansomwareUIDescription",
                                                                                              "childSettings":  [
@@ -91,7 +91,7 @@
                                                                },
                                                                {
                                                                    "dataType":  16,
-                                                                   "category":  31,
+                                                                   "category":  34,
                                                                    "nameResourceKey":  "defenderSecurityCenterDisableAccountUIName",
                                                                    "descriptionResourceKey":  "defenderSecurityCenterDisableAccountUIDescription",
                                                                    "childSettings":  [
@@ -120,7 +120,7 @@
                                                                },
                                                                {
                                                                    "dataType":  16,
-                                                                   "category":  31,
+                                                                   "category":  34,
                                                                    "nameResourceKey":  "defenderSecurityCenterDisableNetworkUIName",
                                                                    "descriptionResourceKey":  "defenderSecurityCenterDisableNetworkUIDescription",
                                                                    "childSettings":  [
@@ -149,7 +149,7 @@
                                                                },
                                                                {
                                                                    "dataType":  16,
-                                                                   "category":  31,
+                                                                   "category":  34,
                                                                    "nameResourceKey":  "defenderSecurityCenterDisableAppBrowserUIName",
                                                                    "descriptionResourceKey":  "defenderSecurityCenterDisableAppBrowserUIDescription",
                                                                    "childSettings":  [
@@ -178,7 +178,7 @@
                                                                },
                                                                {
                                                                    "dataType":  19,
-                                                                   "category":  31,
+                                                                   "category":  34,
                                                                    "nameResourceKey":  "defenderSecurityCenterDisableHardwareUIName",
                                                                    "descriptionResourceKey":  "defenderSecurityCenterDisableHardwareUIDescription",
                                                                    "childSettings":  [
@@ -204,7 +204,7 @@
                                                                },
                                                                {
                                                                    "dataType":  16,
-                                                                   "category":  31,
+                                                                   "category":  34,
                                                                    "nameResourceKey":  "defenderSecurityCenterDisableHealthUIName",
                                                                    "descriptionResourceKey":  "defenderSecurityCenterDisableHealthUIDescription",
                                                                    "childSettings":  [
@@ -233,7 +233,7 @@
                                                                },
                                                                {
                                                                    "dataType":  16,
-                                                                   "category":  31,
+                                                                   "category":  34,
                                                                    "nameResourceKey":  "defenderSecurityCenterDisableFamilyUIName",
                                                                    "descriptionResourceKey":  "defenderSecurityCenterDisableFamilyUIDescription",
                                                                    "childSettings":  [
@@ -262,7 +262,7 @@
                                                                },
                                                                {
                                                                    "dataType":  16,
-                                                                   "category":  31,
+                                                                   "category":  34,
                                                                    "nameResourceKey":  "defenderSecurityCenterNotificationsFromAppName",
                                                                    "descriptionResourceKey":  "defenderSecurityCenterNotificationsFromAppDescription",
                                                                    "childSettings":  [
@@ -294,7 +294,7 @@
                                                                },
                                                                {
                                                                    "dataType":  16,
-                                                                   "category":  31,
+                                                                   "category":  34,
                                                                    "nameResourceKey":  "defenderSecurityCenterDisableNotificationAreaUIName",
                                                                    "descriptionResourceKey":  "defenderSecurityCenterDisableNotificationAreaUIDescription",
                                                                    "childSettings":  [
@@ -323,7 +323,7 @@
                                                                },
                                                                {
                                                                    "dataType":  16,
-                                                                   "category":  31,
+                                                                   "category":  34,
                                                                    "nameResourceKey":  "defenderSecurityCenterDisableClearTpmUIName",
                                                                    "descriptionResourceKey":  "defenderSecurityCenterDisableClearTpmUIDescription",
                                                                    "childSettings":  [
@@ -352,7 +352,7 @@
                                                                },
                                                                {
                                                                    "dataType":  16,
-                                                                   "category":  31,
+                                                                   "category":  34,
                                                                    "nameResourceKey":  "defenderSecurityCenterDisableVulnerableTpmFirmwareUpdateUIName",
                                                                    "descriptionResourceKey":  "defenderSecurityCenterDisableVulnerableTpmFirmwareUpdateUIDescription",
                                                                    "childSettings":  [
@@ -381,7 +381,7 @@
                                                                },
                                                                {
                                                                    "dataType":  16,
-                                                                   "category":  31,
+                                                                   "category":  34,
                                                                    "nameResourceKey":  "defenderSecurityCenterTamperProtectionName",
                                                                    "descriptionResourceKey":  "defenderSecurityCenterTamperProtectionDescription",
                                                                    "childSettings":  [
@@ -415,7 +415,7 @@
                                                                    "isSettingDescription":  false,
                                                                    "showAsSectionHeader":  false,
                                                                    "dataType":  8,
-                                                                   "category":  31,
+                                                                   "category":  34,
                                                                    "nameResourceKey":  "defenderSecurityCenterITContactInformationHeaderText",
                                                                    "childSettings":  [
 
@@ -431,7 +431,7 @@
                                                                    "isSettingDescription":  true,
                                                                    "showAsSectionHeader":  false,
                                                                    "dataType":  8,
-                                                                   "category":  31,
+                                                                   "category":  34,
                                                                    "nameResourceKey":  "defenderSecurityCenterITContactInformationSubHeaderText",
                                                                    "childSettings":  [
 
@@ -445,13 +445,13 @@
                                                                },
                                                                {
                                                                    "dataType":  16,
-                                                                   "category":  31,
+                                                                   "category":  34,
                                                                    "nameResourceKey":  "defenderSecurityCenterITContactDisplayName",
                                                                    "descriptionResourceKey":  "defenderSecurityCenterITContactDisplayDescription",
                                                                    "childSettings":  [
                                                                                          {
                                                                                              "dataType":  20,
-                                                                                             "category":  31,
+                                                                                             "category":  34,
                                                                                              "nameResourceKey":  "defenderSecurityCenterOrganizationDisplayNameName",
                                                                                              "descriptionResourceKey":  "defenderSecurityCenterOrganizationDisplayNameName",
                                                                                              "emptyValueResourceKey":  "defenderSecurityCenterOrganizationDisplayNamePlaceholder",
@@ -471,7 +471,7 @@
                                                                                              "isSettingDescription":  false,
                                                                                              "showAsSectionHeader":  false,
                                                                                              "dataType":  8,
-                                                                                             "category":  31,
+                                                                                             "category":  34,
                                                                                              "nameResourceKey":  "defenderSecurityCenterContactOptionsText",
                                                                                              "childSettings":  [
 
@@ -485,7 +485,7 @@
                                                                                          },
                                                                                          {
                                                                                              "dataType":  20,
-                                                                                             "category":  31,
+                                                                                             "category":  34,
                                                                                              "nameResourceKey":  "defenderSecurityCenterHelpPhoneName",
                                                                                              "descriptionResourceKey":  "defenderSecurityCenterHelpPhoneDescription",
                                                                                              "emptyValueResourceKey":  "defenderSecurityCenterHelpPhonePlaceholder",
@@ -503,7 +503,7 @@
                                                                                          },
                                                                                          {
                                                                                              "dataType":  20,
-                                                                                             "category":  31,
+                                                                                             "category":  34,
                                                                                              "nameResourceKey":  "defenderSecurityCenterHelpEmailName",
                                                                                              "descriptionResourceKey":  "defenderSecurityCenterHelpEmailDescription",
                                                                                              "emptyValueResourceKey":  "defenderSecurityCenterHelpEmailPlaceholder",
@@ -521,7 +521,7 @@
                                                                                          },
                                                                                          {
                                                                                              "dataType":  20,
-                                                                                             "category":  31,
+                                                                                             "category":  34,
                                                                                              "nameResourceKey":  "defenderSecurityCenterHelpURLName",
                                                                                              "descriptionResourceKey":  "defenderSecurityCenterHelpURLDescription",
                                                                                              "emptyValueResourceKey":  "defenderSecurityCenterHelpURLPlaceholder",

Documentation/ObjectInfo/deliveryoptimization_windowsdeliveryoptimization.json

@@ -4,7 +4,7 @@
                                                                  "isSettingDescription":  false,
                                                                  "showAsSectionHeader":  false,
                                                                  "dataType":  8,
-                                                                 "category":  34,
+                                                                 "category":  37,
                                                                  "nameResourceKey":  "deliveryOptimizationDOHeader",
                                                                  "childSettings":  [
 
@@ -20,7 +20,7 @@
                                                                  "isSettingDescription":  false,
                                                                  "showAsSectionHeader":  false,
                                                                  "dataType":  8,
-                                                                 "category":  34,
+                                                                 "category":  37,
                                                                  "nameResourceKey":  "LearnMore",
                                                                  "childSettings":  [
 
@@ -34,7 +34,7 @@
                                                              },
                                                              {
                                                                  "dataType":  16,
-                                                                 "category":  34,
+                                                                 "category":  37,
                                                                  "nameResourceKey":  "deliveryOptimizationName",
                                                                  "descriptionResourceKey":  "deliveryOptimizationDODescription",
                                                                  "childSettings":  [
@@ -85,7 +85,7 @@
                                                              },
                                                              {
                                                                  "dataType":  16,
-                                                                 "category":  34,
+                                                                 "category":  37,
                                                                  "nameResourceKey":  "deliveryOptimizationDownloadModeName",
                                                                  "descriptionResourceKey":  "deliveryOptimizationDODescription",
                                                                  "childSettings":  [
@@ -93,7 +93,7 @@
                                                                                            "isSettingDescription":  false,
                                                                                            "showAsSectionHeader":  false,
                                                                                            "dataType":  8,
-                                                                                           "category":  34,
+                                                                                           "category":  37,
                                                                                            "nameResourceKey":  "DeliveryOptimizationBandwidthHeader",
                                                                                            "childSettings":  [
 
@@ -109,7 +109,7 @@
                                                                                            "complexOptions":  [
                                                                                                                   {
                                                                                                                       "dataType":  16,
-                                                                                                                      "category":  34,
+                                                                                                                      "category":  37,
                                                                                                                       "nameResourceKey":  "DoBandwidthModeName",
                                                                                                                       "descriptionResourceKey":  "DoBandwidthModeDescription",
                                                                                                                       "childSettings":  [
@@ -126,7 +126,7 @@
                                                                                                                                           "children":  [
                                                                                                                                                            {
                                                                                                                                                                "dataType":  15,
-                                                                                                                                                               "category":  34,
+                                                                                                                                                               "category":  37,
                                                                                                                                                                "nameResourceKey":  "DoMaximumDownloadBandwidthName",
                                                                                                                                                                "descriptionResourceKey":  "DoMaximumDownloadBandwidthDescription",
                                                                                                                                                                "emptyValueResourceKey":  "ValueInKilobytesPerSecondEmpty",
@@ -143,7 +143,7 @@
                                                                                                                                                            },
                                                                                                                                                            {
                                                                                                                                                                "dataType":  15,
-                                                                                                                                                               "category":  34,
+                                                                                                                                                               "category":  37,
                                                                                                                                                                "nameResourceKey":  "DoMaximumUploadBandwidthName",
                                                                                                                                                                "descriptionResourceKey":  "DoMaximumUploadBandwidthDescription",
                                                                                                                                                                "emptyValueResourceKey":  "ValueInKilobytesPerSecondEmpty",
@@ -167,7 +167,7 @@
                                                                                                                                           "children":  [
                                                                                                                                                            {
                                                                                                                                                                "dataType":  14,
-                                                                                                                                                               "category":  34,
+                                                                                                                                                               "category":  37,
                                                                                                                                                                "nameResourceKey":  "DoMaximumForegroundBandwidthName",
                                                                                                                                                                "descriptionResourceKey":  "DoMaximumForegroundBandwidthDescription",
                                                                                                                                                                "childSettings":  [
@@ -183,7 +183,7 @@
                                                                                                                                                            },
                                                                                                                                                            {
                                                                                                                                                                "dataType":  14,
-                                                                                                                                                               "category":  34,
+                                                                                                                                                               "category":  37,
                                                                                                                                                                "nameResourceKey":  "DoMaximumBackgroundBandwidthName",
                                                                                                                                                                "descriptionResourceKey":  "DoMaximumBackgroundBandwidthDescription",
                                                                                                                                                                "childSettings":  [
@@ -208,7 +208,7 @@
                                                                                                                                                                "isSettingDescription":  false,
                                                                                                                                                                "showAsSectionHeader":  false,
                                                                                                                                                                "dataType":  8,
-                                                                                                                                                               "category":  34,
+                                                                                                                                                               "category":  37,
                                                                                                                                                                "nameResourceKey":  "DoMaxForegroundBandwidthHeader",
                                                                                                                                                                "childSettings":  [
 
@@ -225,7 +225,7 @@
                                                                                                                                                                                       {
                                                                                                                                                                                           "value":  "#microsoft.graph.deliveryOptimizationBandwidthBusinessHoursLimit",
                                                                                                                                                                                           "dataType":  9,
-                                                                                                                                                                                          "category":  34,
+                                                                                                                                                                                          "category":  37,
                                                                                                                                                                                           "childSettings":  [
 
                                                                                                                                                                                                             ],
@@ -239,13 +239,13 @@
                                                                                                                                                                                       },
                                                                                                                                                                                       {
                                                                                                                                                                                           "dataType":  16,
-                                                                                                                                                                                          "category":  34,
+                                                                                                                                                                                          "category":  37,
                                                                                                                                                                                           "nameResourceKey":  "DoBusinessBeginName",
                                                                                                                                                                                           "descriptionResourceKey":  "DoBusinessName",
                                                                                                                                                                                           "childSettings":  [
                                                                                                                                                                                                                 {
                                                                                                                                                                                                                     "dataType":  16,
-                                                                                                                                                                                                                    "category":  34,
+                                                                                                                                                                                                                    "category":  37,
                                                                                                                                                                                                                     "nameResourceKey":  "DoBusinessEndName",
                                                                                                                                                                                                                     "descriptionResourceKey":  "DoBusinessEndName",
                                                                                                                                                                                                                     "childSettings":  [
@@ -384,7 +384,7 @@
                                                                                                                                                                                                                 },
                                                                                                                                                                                                                 {
                                                                                                                                                                                                                     "dataType":  14,
-                                                                                                                                                                                                                    "category":  34,
+                                                                                                                                                                                                                    "category":  37,
                                                                                                                                                                                                                     "nameResourceKey":  "DoBusinessPercentageDuringName",
                                                                                                                                                                                                                     "descriptionResourceKey":  "DoBusinessPercentageDuringName",
                                                                                                                                                                                                                     "childSettings":  [
@@ -400,7 +400,7 @@
                                                                                                                                                                                                                 },
                                                                                                                                                                                                                 {
                                                                                                                                                                                                                     "dataType":  14,
-                                                                                                                                                                                                                    "category":  34,
+                                                                                                                                                                                                                    "category":  37,
                                                                                                                                                                                                                     "nameResourceKey":  "DoBusinessPercentageOutsideName",
                                                                                                                                                                                                                     "descriptionResourceKey":  "DoBusinessPercentageOutsideName",
                                                                                                                                                                                                                     "childSettings":  [
@@ -548,7 +548,7 @@
                                                                                                                                                                                       }
                                                                                                                                                                                   ],
                                                                                                                                                                "dataType":  6,
-                                                                                                                                                               "category":  34,
+                                                                                                                                                               "category":  37,
                                                                                                                                                                "childSettings":  [
 
                                                                                                                                                                                  ],
@@ -564,7 +564,7 @@
                                                                                                                                                                "isSettingDescription":  false,
                                                                                                                                                                "showAsSectionHeader":  false,
                                                                                                                                                                "dataType":  8,
-                                                                                                                                                               "category":  34,
+                                                                                                                                                               "category":  37,
                                                                                                                                                                "nameResourceKey":  "DoMaxBackgroundBandwidthHeader",
                                                                                                                                                                "childSettings":  [
 
@@ -581,7 +581,7 @@
                                                                                                                                                                                       {
                                                                                                                                                                                           "value":  "#microsoft.graph.deliveryOptimizationBandwidthBusinessHoursLimit",
                                                                                                                                                                                           "dataType":  9,
-                                                                                                                                                                                          "category":  34,
+                                                                                                                                                                                          "category":  37,
                                                                                                                                                                                           "childSettings":  [
 
                                                                                                                                                                                                             ],
@@ -595,13 +595,13 @@
                                                                                                                                                                                       },
                                                                                                                                                                                       {
                                                                                                                                                                                           "dataType":  16,
-                                                                                                                                                                                          "category":  34,
+                                                                                                                                                                                          "category":  37,
                                                                                                                                                                                           "nameResourceKey":  "DoBusinessBeginName",
                                                                                                                                                                                           "descriptionResourceKey":  "DoBusinessName",
                                                                                                                                                                                           "childSettings":  [
                                                                                                                                                                                                                 {
                                                                                                                                                                                                                     "dataType":  16,
-                                                                                                                                                                                                                    "category":  34,
+                                                                                                                                                                                                                    "category":  37,
                                                                                                                                                                                                                     "nameResourceKey":  "DoBusinessEndName",
                                                                                                                                                                                                                     "descriptionResourceKey":  "DoBusinessEndName",
                                                                                                                                                                                                                     "childSettings":  [
@@ -740,7 +740,7 @@
                                                                                                                                                                                                                 },
                                                                                                                                                                                                                 {
                                                                                                                                                                                                                     "dataType":  14,
-                                                                                                                                                                                                                    "category":  34,
+                                                                                                                                                                                                                    "category":  37,
                                                                                                                                                                                                                     "nameResourceKey":  "DoBusinessPercentageDuringName",
                                                                                                                                                                                                                     "descriptionResourceKey":  "DoBusinessPercentageDuringName",
                                                                                                                                                                                                                     "childSettings":  [
@@ -756,7 +756,7 @@
                                                                                                                                                                                                                 },
                                                                                                                                                                                                                 {
                                                                                                                                                                                                                     "dataType":  14,
-                                                                                                                                                                                                                    "category":  34,
+                                                                                                                                                                                                                    "category":  37,
                                                                                                                                                                                                                     "nameResourceKey":  "DoBusinessPercentageOutsideName",
                                                                                                                                                                                                                     "descriptionResourceKey":  "DoBusinessPercentageOutsideName",
                                                                                                                                                                                                                     "childSettings":  [
@@ -904,7 +904,7 @@
                                                                                                                                                                                       }
                                                                                                                                                                                   ],
                                                                                                                                                                "dataType":  6,
-                                                                                                                                                               "category":  34,
+                                                                                                                                                               "category":  37,
                                                                                                                                                                "childSettings":  [
 
                                                                                                                                                                                  ],
@@ -927,7 +927,7 @@
                                                                                                                   }
                                                                                                               ],
                                                                                            "dataType":  6,
-                                                                                           "category":  34,
+                                                                                           "category":  37,
                                                                                            "childSettings":  [
 
                                                                                                              ],
@@ -941,7 +941,7 @@
                                                                                        },
                                                                                        {
                                                                                            "dataType":  15,
-                                                                                           "category":  34,
+                                                                                           "category":  37,
                                                                                            "nameResourceKey":  "DoBackgroundDownloadFromHttpDelayInSecondsName",
                                                                                            "descriptionResourceKey":  "DoBackgroundDownloadFromHttpDelayInSecondsDescription",
                                                                                            "emptyValueResourceKey":  "DoBackgroundDownloadFromHttpDelayInSecondsEmpty",
@@ -960,7 +960,7 @@
                                                                                        },
                                                                                        {
                                                                                            "dataType":  15,
-                                                                                           "category":  34,
+                                                                                           "category":  37,
                                                                                            "nameResourceKey":  "DoForegroundDownloadFromHttpDelayInSecondsName",
                                                                                            "descriptionResourceKey":  "DoForegroundDownloadFromHttpDelayInSecondsDescription",
                                                                                            "emptyValueResourceKey":  "DoForegroundDownloadFromHttpDelayInSecondsEmpty",
@@ -979,7 +979,7 @@
                                                                                            "isSettingDescription":  false,
                                                                                            "showAsSectionHeader":  false,
                                                                                            "dataType":  8,
-                                                                                           "category":  34,
+                                                                                           "category":  37,
                                                                                            "nameResourceKey":  "DeliveryOptimizationCachingHeader",
                                                                                            "childSettings":  [
 
@@ -993,7 +993,7 @@
                                                                                        },
                                                                                        {
                                                                                            "dataType":  14,
-                                                                                           "category":  34,
+                                                                                           "category":  37,
                                                                                            "nameResourceKey":  "DoMinRamName",
                                                                                            "descriptionResourceKey":  "DoMinRamDescription",
                                                                                            "emptyValueResourceKey":  "DoMinRamEmpty",
@@ -1010,7 +1010,7 @@
                                                                                        },
                                                                                        {
                                                                                            "dataType":  14,
-                                                                                           "category":  34,
+                                                                                           "category":  37,
                                                                                            "nameResourceKey":  "DoMinDiskName",
                                                                                            "descriptionResourceKey":  "DoMinDiskDescription",
                                                                                            "emptyValueResourceKey":  "DoMinRamEmpty",
@@ -1027,7 +1027,7 @@
                                                                                        },
                                                                                        {
                                                                                            "dataType":  14,
-                                                                                           "category":  34,
+                                                                                           "category":  37,
                                                                                            "nameResourceKey":  "DoMinFileSizeName",
                                                                                            "descriptionResourceKey":  "DoMinFileSizeDescription",
                                                                                            "emptyValueResourceKey":  "DoMinFileEmpty",
@@ -1044,7 +1044,7 @@
                                                                                        },
                                                                                        {
                                                                                            "dataType":  14,
-                                                                                           "category":  34,
+                                                                                           "category":  37,
                                                                                            "nameResourceKey":  "DoMinBatteryName",
                                                                                            "descriptionResourceKey":  "DoMinBatteryDescription",
                                                                                            "emptyValueResourceKey":  "ValueZeroNotLimitedEmpty",
@@ -1061,7 +1061,7 @@
                                                                                        },
                                                                                        {
                                                                                            "dataType":  20,
-                                                                                           "category":  34,
+                                                                                           "category":  37,
                                                                                            "nameResourceKey":  "DoModifyCacheName",
                                                                                            "descriptionResourceKey":  "DoModifyCacheDescription",
                                                                                            "emptyValueResourceKey":  "DoModifyCacheEmpty",
@@ -1078,7 +1078,7 @@
                                                                                        },
                                                                                        {
                                                                                            "dataType":  14,
-                                                                                           "category":  34,
+                                                                                           "category":  37,
                                                                                            "nameResourceKey":  "DoMaxCacheAgeName",
                                                                                            "descriptionResourceKey":  "DoMaxCacheAgeDescription",
                                                                                            "emptyValueResourceKey":  "ValueZeroNotLimitedEmpty",
@@ -1097,7 +1097,7 @@
                                                                                            "complexOptions":  [
                                                                                                                   {
                                                                                                                       "dataType":  16,
-                                                                                                                      "category":  34,
+                                                                                                                      "category":  37,
                                                                                                                       "nameResourceKey":  "DoMaxCacheTypeName",
                                                                                                                       "descriptionResourceKey":  "DoMaxCacheTypeDescription",
                                                                                                                       "childSettings":  [
@@ -1114,7 +1114,7 @@
                                                                                                                                           "children":  [
                                                                                                                                                            {
                                                                                                                                                                "dataType":  15,
-                                                                                                                                                               "category":  34,
+                                                                                                                                                               "category":  37,
                                                                                                                                                                "nameResourceKey":  "DoMaxCacheSizeName",
                                                                                                                                                                "descriptionResourceKey":  "DoMaxCacheSizeDescription",
                                                                                                                                                                "emptyValueResourceKey":  "ValueZeroNotLimitedEmpty",
@@ -1138,7 +1138,7 @@
                                                                                                                                           "children":  [
                                                                                                                                                            {
                                                                                                                                                                "dataType":  14,
-                                                                                                                                                               "category":  34,
+                                                                                                                                                               "category":  37,
                                                                                                                                                                "nameResourceKey":  "DoMaxCacheSizePercentageName",
                                                                                                                                                                "descriptionResourceKey":  "DoMaxCacheSizePercentageDescription",
                                                                                                                                                                "emptyValueResourceKey":  "DoMaxCacheSizePercentageEmpty",
@@ -1164,7 +1164,7 @@
                                                                                                                   }
                                                                                                               ],
                                                                                            "dataType":  6,
-                                                                                           "category":  34,
+                                                                                           "category":  37,
                                                                                            "childSettings":  [
 
                                                                                                              ],
@@ -1178,7 +1178,7 @@
                                                                                        },
                                                                                        {
                                                                                            "dataType":  16,
-                                                                                           "category":  34,
+                                                                                           "category":  37,
                                                                                            "nameResourceKey":  "DoVpnPeerCachingName",
                                                                                            "descriptionResourceKey":  "DoVpnPeerCachingDescription",
                                                                                            "childSettings":  [
@@ -1226,7 +1226,7 @@
                                                                                      "children":  [
                                                                                                       {
                                                                                                           "dataType":  16,
-                                                                                                          "category":  34,
+                                                                                                          "category":  37,
                                                                                                           "nameResourceKey":  "RestrictPeerSelectionByName",
                                                                                                           "descriptionResourceKey":  "RestrictPeerSelectionByDescription",
                                                                                                           "childSettings":  [
@@ -1260,7 +1260,7 @@
                                                                                      "children":  [
                                                                                                       {
                                                                                                           "dataType":  16,
-                                                                                                          "category":  34,
+                                                                                                          "category":  37,
                                                                                                           "nameResourceKey":  "RestrictPeerSelectionByName",
                                                                                                           "descriptionResourceKey":  "RestrictPeerSelectionByDescription",
                                                                                                           "childSettings":  [
@@ -1287,7 +1287,7 @@
                                                                                                       },
                                                                                                       {
                                                                                                           "dataType":  16,
-                                                                                                          "category":  34,
+                                                                                                          "category":  37,
                                                                                                           "nameResourceKey":  "DoGroupIdSourceName",
                                                                                                           "descriptionResourceKey":  "DoGroupIdSourceDescription",
                                                                                                           "childSettings":  [
@@ -1308,7 +1308,7 @@
                                                                                                                                                                           {
                                                                                                                                                                               "value":  "#microsoft.graph.deliveryOptimizationGroupIdSourceOptions",
                                                                                                                                                                               "dataType":  9,
-                                                                                                                                                                              "category":  34,
+                                                                                                                                                                              "category":  37,
                                                                                                                                                                               "childSettings":  [
 
                                                                                                                                                                                                 ],
@@ -1323,7 +1323,7 @@
                                                                                                                                                                           {
                                                                                                                                                                               "value":  "adSite",
                                                                                                                                                                               "dataType":  9,
-                                                                                                                                                                              "category":  34,
+                                                                                                                                                                              "category":  37,
                                                                                                                                                                               "childSettings":  [
 
                                                                                                                                                                                                 ],
@@ -1337,7 +1337,7 @@
                                                                                                                                                                           }
                                                                                                                                                                       ],
                                                                                                                                                    "dataType":  6,
-                                                                                                                                                   "category":  34,
+                                                                                                                                                   "category":  37,
                                                                                                                                                    "childSettings":  [
 
                                                                                                                                                                      ],
@@ -1361,7 +1361,7 @@
                                                                                                                                                                           {
                                                                                                                                                                               "value":  "#microsoft.graph.deliveryOptimizationGroupIdSourceOptions",
                                                                                                                                                                               "dataType":  9,
-                                                                                                                                                                              "category":  34,
+                                                                                                                                                                              "category":  37,
                                                                                                                                                                               "childSettings":  [
 
                                                                                                                                                                                                 ],
@@ -1376,7 +1376,7 @@
                                                                                                                                                                           {
                                                                                                                                                                               "value":  "authenticatedDomainSid",
                                                                                                                                                                               "dataType":  9,
-                                                                                                                                                                              "category":  34,
+                                                                                                                                                                              "category":  37,
                                                                                                                                                                               "childSettings":  [
 
                                                                                                                                                                                                 ],
@@ -1390,7 +1390,7 @@
                                                                                                                                                                           }
                                                                                                                                                                       ],
                                                                                                                                                    "dataType":  6,
-                                                                                                                                                   "category":  34,
+                                                                                                                                                   "category":  37,
                                                                                                                                                    "childSettings":  [
 
                                                                                                                                                                      ],
@@ -1414,7 +1414,7 @@
                                                                                                                                                                           {
                                                                                                                                                                               "value":  "#microsoft.graph.deliveryOptimizationGroupIdSourceOptions",
                                                                                                                                                                               "dataType":  9,
-                                                                                                                                                                              "category":  34,
+                                                                                                                                                                              "category":  37,
                                                                                                                                                                               "childSettings":  [
 
                                                                                                                                                                                                 ],
@@ -1429,7 +1429,7 @@
                                                                                                                                                                           {
                                                                                                                                                                               "value":  "dhcpUserOption",
                                                                                                                                                                               "dataType":  9,
-                                                                                                                                                                              "category":  34,
+                                                                                                                                                                              "category":  37,
                                                                                                                                                                               "childSettings":  [
 
                                                                                                                                                                                                 ],
@@ -1443,7 +1443,7 @@
                                                                                                                                                                           }
                                                                                                                                                                       ],
                                                                                                                                                    "dataType":  6,
-                                                                                                                                                   "category":  34,
+                                                                                                                                                   "category":  37,
                                                                                                                                                    "childSettings":  [
 
                                                                                                                                                                      ],
@@ -1467,7 +1467,7 @@
                                                                                                                                                                           {
                                                                                                                                                                               "value":  "#microsoft.graph.deliveryOptimizationGroupIdSourceOptions",
                                                                                                                                                                               "dataType":  9,
-                                                                                                                                                                              "category":  34,
+                                                                                                                                                                              "category":  37,
                                                                                                                                                                               "childSettings":  [
 
                                                                                                                                                                                                 ],
@@ -1482,7 +1482,7 @@
                                                                                                                                                                           {
                                                                                                                                                                               "value":  "dnsSuffix",
                                                                                                                                                                               "dataType":  9,
-                                                                                                                                                                              "category":  34,
+                                                                                                                                                                              "category":  37,
                                                                                                                                                                               "childSettings":  [
 
                                                                                                                                                                                                 ],
@@ -1496,7 +1496,7 @@
                                                                                                                                                                           }
                                                                                                                                                                       ],
                                                                                                                                                    "dataType":  6,
-                                                                                                                                                   "category":  34,
+                                                                                                                                                   "category":  37,
                                                                                                                                                    "childSettings":  [
 
                                                                                                                                                                      ],
@@ -1520,7 +1520,7 @@
                                                                                                                                                                           {
                                                                                                                                                                               "value":  "#microsoft.graph.deliveryOptimizationGroupIdCustom",
                                                                                                                                                                               "dataType":  9,
-                                                                                                                                                                              "category":  34,
+                                                                                                                                                                              "category":  37,
                                                                                                                                                                               "childSettings":  [
 
                                                                                                                                                                                                 ],
@@ -1534,7 +1534,7 @@
                                                                                                                                                                           },
                                                                                                                                                                           {
                                                                                                                                                                               "dataType":  20,
-                                                                                                                                                                              "category":  34,
+                                                                                                                                                                              "category":  37,
                                                                                                                                                                               "nameResourceKey":  "DoGroupIdCustomName",
                                                                                                                                                                               "descriptionResourceKey":  "DoGroupIdCustomDescription",
                                                                                                                                                                               "emptyValueResourceKey":  "DoGroupIdCustomEmpty",
@@ -1551,7 +1551,7 @@
                                                                                                                                                                           }
                                                                                                                                                                       ],
                                                                                                                                                    "dataType":  6,
-                                                                                                                                                   "category":  34,
+                                                                                                                                                   "category":  37,
                                                                                                                                                    "childSettings":  [
 
                                                                                                                                                                      ],
@@ -1604,7 +1604,7 @@
                                                                  "isSettingDescription":  false,
                                                                  "showAsSectionHeader":  false,
                                                                  "dataType":  8,
-                                                                 "category":  34,
+                                                                 "category":  37,
                                                                  "nameResourceKey":  "localServerCachingHeader",
                                                                  "childSettings":  [
 
@@ -1621,7 +1621,7 @@
                                                                                  {
                                                                                      "metadata":  {
                                                                                                       "dataType":  20,
-                                                                                                      "category":  34,
+                                                                                                      "category":  37,
                                                                                                       "nameResourceKey":  "cacheServerColumns",
                                                                                                       "childSettings":  [
 
@@ -1637,7 +1637,7 @@
                                                                                  }
                                                                              ],
                                                                  "dataType":  21,
-                                                                 "category":  34,
+                                                                 "category":  37,
                                                                  "nameResourceKey":  "cacheServerHostNamesName",
                                                                  "descriptionResourceKey":  "cacheServerHostNamesDescription",
                                                                  "childSettings":  [
@@ -1653,7 +1653,7 @@
                                                              },
                                                              {
                                                                  "dataType":  14,
-                                                                 "category":  34,
+                                                                 "category":  37,
                                                                  "nameResourceKey":  "cacheServerForegroundDownloadFallbackToHttpDelayName",
                                                                  "descriptionResourceKey":  "cacheServerForegroundDownloadFallbackToHttpDelayDescription",
                                                                  "childSettings":  [
@@ -1671,7 +1671,7 @@
                                                              },
                                                              {
                                                                  "dataType":  14,
-                                                                 "category":  34,
+                                                                 "category":  37,
                                                                  "nameResourceKey":  "cacheServerBackgroundDownloadFallbackToHttpDelayName",
                                                                  "descriptionResourceKey":  "cacheServerBackgroundDownloadFallbackToHttpDelayDescription",
                                                                  "childSettings":  [
@@ -1689,7 +1689,7 @@
                                                              },
                                                              {
                                                                  "dataType":  9,
-                                                                 "category":  34,
+                                                                 "category":  37,
                                                                  "nameResourceKey":  "DoMaxCacheSizePercentageName",
                                                                  "childSettings":  [
 
@@ -1704,7 +1704,7 @@
                                                              },
                                                              {
                                                                  "dataType":  9,
-                                                                 "category":  34,
+                                                                 "category":  37,
                                                                  "nameResourceKey":  "DoVpnPeerCachingName",
                                                                  "childSettings":  [
 
@@ -1719,7 +1719,7 @@
                                                              },
                                                              {
                                                                  "dataType":  9,
-                                                                 "category":  34,
+                                                                 "category":  37,
                                                                  "nameResourceKey":  "DoMaxCacheAgeName",
                                                                  "childSettings":  [
 
@@ -1734,7 +1734,7 @@
                                                              },
                                                              {
                                                                  "dataType":  9,
-                                                                 "category":  34,
+                                                                 "category":  37,
                                                                  "nameResourceKey":  "DoGroupIdSourceName",
                                                                  "childSettings":  [
 
@@ -1749,7 +1749,7 @@
                                                              },
                                                              {
                                                                  "dataType":  9,
-                                                                 "category":  34,
+                                                                 "category":  37,
                                                                  "nameResourceKey":  "DoGroupIdSourceName",
                                                                  "childSettings":  [
 
@@ -1764,7 +1764,7 @@
                                                              },
                                                              {
                                                                  "dataType":  9,
-                                                                 "category":  34,
+                                                                 "category":  37,
                                                                  "nameResourceKey":  "DoMaxCacheSizeName",
                                                                  "childSettings":  [
 
@@ -1779,7 +1779,7 @@
                                                              },
                                                              {
                                                                  "dataType":  9,
-                                                                 "category":  34,
+                                                                 "category":  37,
                                                                  "nameResourceKey":  "DoMaximumDownloadBandwidthName",
                                                                  "childSettings":  [
 
@@ -1794,7 +1794,7 @@
                                                              },
                                                              {
                                                                  "dataType":  9,
-                                                                 "category":  34,
+                                                                 "category":  37,
                                                                  "nameResourceKey":  "DoMaximumUploadBandwidthName",
                                                                  "childSettings":  [
 
@@ -1809,7 +1809,7 @@
                                                              },
                                                              {
                                                                  "dataType":  9,
-                                                                 "category":  34,
+                                                                 "category":  37,
                                                                  "nameResourceKey":  "DoMaximumBackgroundBandwidthName",
                                                                  "childSettings":  [
 
@@ -1824,7 +1824,7 @@
                                                              },
                                                              {
                                                                  "dataType":  9,
-                                                                 "category":  34,
+                                                                 "category":  37,
                                                                  "nameResourceKey":  "DoMaximumForegroundBandwidthName",
                                                                  "childSettings":  [
 
@@ -1839,7 +1839,7 @@
                                                              },
                                                              {
                                                                  "dataType":  9,
-                                                                 "category":  34,
+                                                                 "category":  37,
                                                                  "nameResourceKey":  "DoMaxForegroundBandwidthHeader",
                                                                  "childSettings":  [
 
@@ -1854,7 +1854,7 @@
                                                              },
                                                              {
                                                                  "dataType":  9,
-                                                                 "category":  34,
+                                                                 "category":  37,
                                                                  "nameResourceKey":  "DoMaxBackgroundBandwidthHeader",
                                                                  "childSettings":  [
 

Documentation/ObjectInfo/derivedcredentialauthenticationconfiguration_androiddeviceownerderivedcredentialappauthenticationconfiguration.json

@@ -2,11 +2,11 @@
     "derivedcredentialauthenticationconfiguration_androiddeviceownerderivedcredentialappauthenticationconfiguration":  [
                                                                                                                            {
                                                                                                                                "dataType":  9,
-                                                                                                                               "category":  35,
+                                                                                                                               "category":  38,
                                                                                                                                "childSettings":  [
                                                                                                                                                      {
                                                                                                                                                          "dataType":  10,
-                                                                                                                                                         "category":  35,
+                                                                                                                                                         "category":  38,
                                                                                                                                                          "nameResourceKey":  "derivedCredentialsSearchingForTenantLevel",
                                                                                                                                                          "childSettings":  [
 
@@ -20,7 +20,7 @@
                                                                                                                                                      },
                                                                                                                                                      {
                                                                                                                                                          "dataType":  10,
-                                                                                                                                                         "category":  35,
+                                                                                                                                                         "category":  38,
                                                                                                                                                          "nameResourceKey":  "derivedCredentialsTenantLevelNotConfigured",
                                                                                                                                                          "childSettings":  [
 
@@ -45,7 +45,7 @@
                                                                                                                                "isSettingDescription":  false,
                                                                                                                                "showAsSectionHeader":  false,
                                                                                                                                "dataType":  8,
-                                                                                                                               "category":  35,
+                                                                                                                               "category":  38,
                                                                                                                                "nameResourceKey":  "derivedCredentialAppAuthenticationHeader",
                                                                                                                                "childSettings":  [
 
@@ -61,7 +61,7 @@
                                                                                                                                "isSettingDescription":  false,
                                                                                                                                "showAsSectionHeader":  false,
                                                                                                                                "dataType":  8,
-                                                                                                                               "category":  35,
+                                                                                                                               "category":  38,
                                                                                                                                "nameResourceKey":  "derivedCredentialAppAuthenticationHeaderLearnMore",
                                                                                                                                "childSettings":  [
 

Documentation/ObjectInfo/derivedcredentialauthenticationconfiguration_iosderivedcredentialauthenticationconfiguration.json

@@ -2,11 +2,11 @@
     "derivedcredentialauthenticationconfiguration_iosderivedcredentialauthenticationconfiguration":  [
                                                                                                          {
                                                                                                              "dataType":  9,
-                                                                                                             "category":  35,
+                                                                                                             "category":  38,
                                                                                                              "childSettings":  [
                                                                                                                                    {
                                                                                                                                        "dataType":  10,
-                                                                                                                                       "category":  35,
+                                                                                                                                       "category":  38,
                                                                                                                                        "nameResourceKey":  "derivedCredentialsSearchingForTenantLevel",
                                                                                                                                        "childSettings":  [
 
@@ -20,7 +20,7 @@
                                                                                                                                    },
                                                                                                                                    {
                                                                                                                                        "dataType":  10,
-                                                                                                                                       "category":  35,
+                                                                                                                                       "category":  38,
                                                                                                                                        "nameResourceKey":  "derivedCredentialsTenantLevelNotConfigured",
                                                                                                                                        "childSettings":  [
 
@@ -45,7 +45,7 @@
                                                                                                              "isSettingDescription":  false,
                                                                                                              "showAsSectionHeader":  false,
                                                                                                              "dataType":  8,
-                                                                                                             "category":  35,
+                                                                                                             "category":  38,
                                                                                                              "nameResourceKey":  "derivedCredentialAppAuthenticationHeader",
                                                                                                              "childSettings":  [
 
@@ -61,7 +61,7 @@
                                                                                                              "isSettingDescription":  false,
                                                                                                              "showAsSectionHeader":  false,
                                                                                                              "dataType":  8,
-                                                                                                             "category":  35,
+                                                                                                             "category":  38,
                                                                                                              "nameResourceKey":  "derivedCredentialAppAuthenticationHeaderLearnMore",
                                                                                                              "childSettings":  [
 

Documentation/ObjectInfo/deviceexperience_androiddeviceownergeneral.json

@@ -3,13 +3,13 @@
                                                        "isSettingDescription":  false,
                                                        "showAsSectionHeader":  true,
                                                        "dataType":  8,
-                                                       "category":  43,
+                                                       "category":  46,
                                                        "nameResourceKey":  "fullyManagedAndDedicatedAndroidEnrollmentTypesHeaderName",
                                                        "descriptionResourceKey":  "fullyManagedAndDedicatedAndroidEnrollmentTypesHeaderDescription",
                                                        "childSettings":  [
                                                                              {
                                                                                  "dataType":  16,
-                                                                                 "category":  43,
+                                                                                 "category":  46,
                                                                                  "nameResourceKey":  "enrollmentProfileTypeName",
                                                                                  "descriptionResourceKey":  "enrollmentProfileTypeDescription",
                                                                                  "childSettings":  [
@@ -29,7 +29,7 @@
                                                                                                                           "isSettingDescription":  false,
                                                                                                                           "showAsSectionHeader":  false,
                                                                                                                           "dataType":  8,
-                                                                                                                          "category":  43,
+                                                                                                                          "category":  46,
                                                                                                                           "nameResourceKey":  "deviceOwnerKioskHeadingText",
                                                                                                                           "childSettings":  [
 
@@ -45,7 +45,7 @@
                                                                                                                           "isSettingDescription":  false,
                                                                                                                           "showAsSectionHeader":  false,
                                                                                                                           "dataType":  8,
-                                                                                                                          "category":  43,
+                                                                                                                          "category":  46,
                                                                                                                           "nameResourceKey":  "deviceOwnerKioskLearnMoreText",
                                                                                                                           "childSettings":  [
 
@@ -59,7 +59,7 @@
                                                                                                                       },
                                                                                                                       {
                                                                                                                           "dataType":  16,
-                                                                                                                          "category":  43,
+                                                                                                                          "category":  46,
                                                                                                                           "nameResourceKey":  "kioskModeName",
                                                                                                                           "descriptionResourceKey":  "kioskModeDescription",
                                                                                                                           "childSettings":  [
@@ -68,17 +68,18 @@
                                                                                                                           "options":  [
                                                                                                                                           {
                                                                                                                                               "nameResourceKey":  "notConfigured",
+                                                                                                                                              "value":  "notConfigured",
                                                                                                                                               "enabled":  true
                                                                                                                                           },
                                                                                                                                           {
                                                                                                                                               "nameResourceKey":  "kioskModeSingle",
-                                                                                                                                              "value":  "single",
+                                                                                                                                              "value":  "singleAppMode",
                                                                                                                                               "children":  [
                                                                                                                                                                {
                                                                                                                                                                    "complexOptions":  [
                                                                                                                                                                                           {
                                                                                                                                                                                               "dataType":  11,
-                                                                                                                                                                                              "category":  43,
+                                                                                                                                                                                              "category":  46,
                                                                                                                                                                                               "nameResourceKey":  "kioskModeManagedAppName",
                                                                                                                                                                                               "descriptionResourceKey":  "kioskModeManagedAppDescription",
                                                                                                                                                                                               "childSettings":  [
@@ -94,7 +95,7 @@
                                                                                                                                                                                           }
                                                                                                                                                                                       ],
                                                                                                                                                                    "dataType":  5,
-                                                                                                                                                                   "category":  43,
+                                                                                                                                                                   "category":  46,
                                                                                                                                                                    "nameResourceKey":  "kioskModeManagedAppName",
                                                                                                                                                                    "emptyValueResourceKey":  "selectManagedApp",
                                                                                                                                                                    "childSettings":  [
@@ -113,11 +114,11 @@
                                                                                                                                           },
                                                                                                                                           {
                                                                                                                                               "nameResourceKey":  "kioskModeMulti",
-                                                                                                                                              "value":  "multi",
+                                                                                                                                              "value":  "multiAppMode",
                                                                                                                                               "children":  [
                                                                                                                                                                {
                                                                                                                                                                    "dataType":  25,
-                                                                                                                                                                   "category":  43,
+                                                                                                                                                                   "category":  46,
                                                                                                                                                                    "childSettings":  [
 
                                                                                                                                                                                      ],
@@ -130,7 +131,7 @@
                                                                                                                                                                },
                                                                                                                                                                {
                                                                                                                                                                    "dataType":  16,
-                                                                                                                                                                   "category":  43,
+                                                                                                                                                                   "category":  46,
                                                                                                                                                                    "nameResourceKey":  "kioskFolderIconName",
                                                                                                                                                                    "descriptionResourceKey":  "kioskFolderIconDescription",
                                                                                                                                                                    "childSettings":  [
@@ -172,7 +173,7 @@
                                                                                                                                                                },
                                                                                                                                                                {
                                                                                                                                                                    "dataType":  16,
-                                                                                                                                                                   "category":  43,
+                                                                                                                                                                   "category":  46,
                                                                                                                                                                    "nameResourceKey":  "kioskIconSizeName",
                                                                                                                                                                    "descriptionResourceKey":  "kioskIconSizeDescription",
                                                                                                                                                                    "childSettings":  [
@@ -219,7 +220,7 @@
                                                                                                                                                                },
                                                                                                                                                                {
                                                                                                                                                                    "dataType":  16,
-                                                                                                                                                                   "category":  43,
+                                                                                                                                                                   "category":  46,
                                                                                                                                                                    "nameResourceKey":  "kioskScreenOrientationName",
                                                                                                                                                                    "descriptionResourceKey":  "kioskScreenOrientationDescription",
                                                                                                                                                                    "childSettings":  [
@@ -256,7 +257,7 @@
                                                                                                                                                                },
                                                                                                                                                                {
                                                                                                                                                                    "dataType":  0,
-                                                                                                                                                                   "category":  43,
+                                                                                                                                                                   "category":  46,
                                                                                                                                                                    "nameResourceKey":  "kioskAppNotificationBadgeName",
                                                                                                                                                                    "descriptionResourceKey":  "kioskAppNotificationBadgeDescription",
                                                                                                                                                                    "childSettings":  [
@@ -273,7 +274,7 @@
                                                                                                                                                                },
                                                                                                                                                                {
                                                                                                                                                                    "dataType":  16,
-                                                                                                                                                                   "category":  43,
+                                                                                                                                                                   "category":  46,
                                                                                                                                                                    "nameResourceKey":  "virtualHomeButtonName",
                                                                                                                                                                    "descriptionResourceKey":  "virtualHomeButtonDescription",
                                                                                                                                                                    "childSettings":  [
@@ -305,13 +306,13 @@
                                                                                                                                                                },
                                                                                                                                                                {
                                                                                                                                                                    "dataType":  0,
-                                                                                                                                                                   "category":  43,
+                                                                                                                                                                   "category":  46,
                                                                                                                                                                    "nameResourceKey":  "kioskDropOutName",
                                                                                                                                                                    "descriptionResourceKey":  "kioskDropOutDescription",
                                                                                                                                                                    "childSettings":  [
                                                                                                                                                                                          {
                                                                                                                                                                                              "dataType":  20,
-                                                                                                                                                                                             "category":  43,
+                                                                                                                                                                                             "category":  46,
                                                                                                                                                                                              "nameResourceKey":  "kioskModeExitCodeName",
                                                                                                                                                                                              "descriptionResourceKey":  "kioskModeExitCodeDescription",
                                                                                                                                                                                              "emptyValueResourceKey":  "kioskDropOutCodeEmptyValueKey",
@@ -338,7 +339,7 @@
                                                                                                                                                                },
                                                                                                                                                                {
                                                                                                                                                                    "dataType":  20,
-                                                                                                                                                                   "category":  43,
+                                                                                                                                                                   "category":  46,
                                                                                                                                                                    "nameResourceKey":  "backgroundWallpaperName",
                                                                                                                                                                    "descriptionResourceKey":  "backgroundWallpaperDescription",
                                                                                                                                                                    "emptyValueResourceKey":  "backgroundWallpaperEmptyValueKey",
@@ -355,7 +356,7 @@
                                                                                                                                                                },
                                                                                                                                                                {
                                                                                                                                                                    "dataType":  0,
-                                                                                                                                                                   "category":  43,
+                                                                                                                                                                   "category":  46,
                                                                                                                                                                    "nameResourceKey":  "kioskManagedSettingsName",
                                                                                                                                                                    "descriptionResourceKey":  "kioskManagedSettingsDescription",
                                                                                                                                                                    "childSettings":  [
@@ -372,7 +373,7 @@
                                                                                                                                                                },
                                                                                                                                                                {
                                                                                                                                                                    "dataType":  0,
-                                                                                                                                                                   "category":  43,
+                                                                                                                                                                   "category":  46,
                                                                                                                                                                    "nameResourceKey":  "kioskDebugMenuName",
                                                                                                                                                                    "descriptionResourceKey":  "kioskDebugMenuDescription",
                                                                                                                                                                    "childSettings":  [
@@ -389,7 +390,7 @@
                                                                                                                                                                },
                                                                                                                                                                {
                                                                                                                                                                    "dataType":  0,
-                                                                                                                                                                   "category":  43,
+                                                                                                                                                                   "category":  46,
                                                                                                                                                                    "nameResourceKey":  "kioskWifiConfigName",
                                                                                                                                                                    "descriptionResourceKey":  "kioskWifiConfigDescription",
                                                                                                                                                                    "childSettings":  [
@@ -398,7 +399,7 @@
                                                                                                                                                                                                              {
                                                                                                                                                                                                                  "metadata":  {
                                                                                                                                                                                                                                   "dataType":  20,
-                                                                                                                                                                                                                                  "category":  43,
+                                                                                                                                                                                                                                  "category":  46,
                                                                                                                                                                                                                                   "nameResourceKey":  "kioskWifiSsidColumnName",
                                                                                                                                                                                                                                   "emptyValueResourceKey":  "kioskWifiSsidEmptyValueKey",
                                                                                                                                                                                                                                   "childSettings":  [
@@ -415,7 +416,7 @@
                                                                                                                                                                                                              }
                                                                                                                                                                                                          ],
                                                                                                                                                                                              "dataType":  21,
-                                                                                                                                                                                             "category":  43,
+                                                                                                                                                                                             "category":  46,
                                                                                                                                                                                              "nameResourceKey":  "kioskWifiSsidsName",
                                                                                                                                                                                              "descriptionResourceKey":  "kioskWifiSsidsDescription",
                                                                                                                                                                                              "childSettings":  [
@@ -441,7 +442,7 @@
                                                                                                                                                                },
                                                                                                                                                                {
                                                                                                                                                                    "dataType":  0,
-                                                                                                                                                                   "category":  43,
+                                                                                                                                                                   "category":  46,
                                                                                                                                                                    "nameResourceKey":  "kioskBluetoothConfigName",
                                                                                                                                                                    "descriptionResourceKey":  "kioskBluetoothConfigDescription",
                                                                                                                                                                    "childSettings":  [
@@ -458,7 +459,7 @@
                                                                                                                                                                },
                                                                                                                                                                {
                                                                                                                                                                    "dataType":  0,
-                                                                                                                                                                   "category":  43,
+                                                                                                                                                                   "category":  46,
                                                                                                                                                                    "nameResourceKey":  "kioskFlashlightConfigName",
                                                                                                                                                                    "childSettings":  [
 
@@ -474,7 +475,7 @@
                                                                                                                                                                },
                                                                                                                                                                {
                                                                                                                                                                    "dataType":  0,
-                                                                                                                                                                   "category":  43,
+                                                                                                                                                                   "category":  46,
                                                                                                                                                                    "nameResourceKey":  "kioskMediaVolumeConfigName",
                                                                                                                                                                    "descriptionResourceKey":  "kioskMediaVolumeConfigDescription",
                                                                                                                                                                    "childSettings":  [
@@ -491,7 +492,7 @@
                                                                                                                                                                },
                                                                                                                                                                {
                                                                                                                                                                    "dataType":  0,
-                                                                                                                                                                   "category":  43,
+                                                                                                                                                                   "category":  46,
                                                                                                                                                                    "nameResourceKey":  "kioskDeviceInfoName",
                                                                                                                                                                    "descriptionResourceKey":  "kioskDeviceInfoDescription",
                                                                                                                                                                    "childSettings":  [
@@ -508,13 +509,13 @@
                                                                                                                                                                },
                                                                                                                                                                {
                                                                                                                                                                    "dataType":  0,
-                                                                                                                                                                   "category":  43,
+                                                                                                                                                                   "category":  46,
                                                                                                                                                                    "nameResourceKey":  "kioskScreenSaverConfigName",
                                                                                                                                                                    "descriptionResourceKey":  "kioskScreenSaverConfigDescription",
                                                                                                                                                                    "childSettings":  [
                                                                                                                                                                                          {
                                                                                                                                                                                              "dataType":  20,
-                                                                                                                                                                                             "category":  43,
+                                                                                                                                                                                             "category":  46,
                                                                                                                                                                                              "nameResourceKey":  "kioskScreenSaverImageConfigName",
                                                                                                                                                                                              "emptyValueResourceKey":  "kioskScreenSaverImageEmptyValueKey",
                                                                                                                                                                                              "childSettings":  [
@@ -531,7 +532,7 @@
                                                                                                                                                                                          },
                                                                                                                                                                                          {
                                                                                                                                                                                              "dataType":  14,
-                                                                                                                                                                                             "category":  43,
+                                                                                                                                                                                             "category":  46,
                                                                                                                                                                                              "nameResourceKey":  "kioskScreenSaverDisplayTimeConfigName",
                                                                                                                                                                                              "descriptionResourceKey":  "kioskScreenSaverDisplayTimeConfigDescription",
                                                                                                                                                                                              "emptyValueResourceKey":  "kioskScreenSaverSecondsEmptyValueKey",
@@ -549,7 +550,7 @@
                                                                                                                                                                                          },
                                                                                                                                                                                          {
                                                                                                                                                                                              "dataType":  14,
-                                                                                                                                                                                             "category":  43,
+                                                                                                                                                                                             "category":  46,
                                                                                                                                                                                              "nameResourceKey":  "kioskScreenSaverStartDelayConfigName",
                                                                                                                                                                                              "descriptionResourceKey":  "kioskScreenSaverStartDelayConfigDescription",
                                                                                                                                                                                              "emptyValueResourceKey":  "kioskScreenSaverSecondsEmptyValueKey",
@@ -567,7 +568,7 @@
                                                                                                                                                                                          },
                                                                                                                                                                                          {
                                                                                                                                                                                              "dataType":  0,
-                                                                                                                                                                                             "category":  43,
+                                                                                                                                                                                             "category":  46,
                                                                                                                                                                                              "nameResourceKey":  "kioskScreenSaverDetectMediaConfigName",
                                                                                                                                                                                              "descriptionResourceKey":  "kioskScreenSaverDetectMediaConfigDescription",
                                                                                                                                                                                              "childSettings":  [
@@ -594,13 +595,13 @@
                                                                                                                                                                },
                                                                                                                                                                {
                                                                                                                                                                    "dataType":  0,
-                                                                                                                                                                   "category":  43,
+                                                                                                                                                                   "category":  46,
                                                                                                                                                                    "nameResourceKey":  "kioskManagedHomeScreenSignInEnabledName",
                                                                                                                                                                    "descriptionResourceKey":  "kioskManagedHomeScreenSignInEnabledDescription",
                                                                                                                                                                    "childSettings":  [
                                                                                                                                                                                          {
                                                                                                                                                                                              "dataType":  20,
-                                                                                                                                                                                             "category":  43,
+                                                                                                                                                                                             "category":  46,
                                                                                                                                                                                              "nameResourceKey":  "kioskManagedHomeScreenSignInBackgroundName",
                                                                                                                                                                                              "descriptionResourceKey":  "kioskManagedHomeScreenSignInBackgroundDescription",
                                                                                                                                                                                              "emptyValueResourceKey":  "kioskManagedHomeScreenSignInBackgroundEmptyValueKey",
@@ -618,7 +619,7 @@
                                                                                                                                                                                          },
                                                                                                                                                                                          {
                                                                                                                                                                                              "dataType":  20,
-                                                                                                                                                                                             "category":  43,
+                                                                                                                                                                                             "category":  46,
                                                                                                                                                                                              "nameResourceKey":  "kioskManagedHomeScreenSignInBrandingLogoName",
                                                                                                                                                                                              "descriptionResourceKey":  "kioskManagedHomeScreenSignInBrandingLogoDescription",
                                                                                                                                                                                              "emptyValueResourceKey":  "kioskManagedHomeScreenSignInBrandingLogoEmptyValueKey",
@@ -636,13 +637,13 @@
                                                                                                                                                                                          },
                                                                                                                                                                                          {
                                                                                                                                                                                              "dataType":  0,
-                                                                                                                                                                                             "category":  43,
+                                                                                                                                                                                             "category":  46,
                                                                                                                                                                                              "nameResourceKey":  "kioskManagedHomeScreenPINRequiredName",
                                                                                                                                                                                              "descriptionResourceKey":  "kioskManagedHomeScreenPINRequiredDescription",
                                                                                                                                                                                              "childSettings":  [
                                                                                                                                                                                                                    {
                                                                                                                                                                                                                        "dataType":  16,
-                                                                                                                                                                                                                       "category":  43,
+                                                                                                                                                                                                                       "category":  46,
                                                                                                                                                                                                                        "nameResourceKey":  "kioskManagedHomeScreenPINComplexityName",
                                                                                                                                                                                                                        "descriptionResourceKey":  "kioskManagedHomeScreenPINComplexityDescription",
                                                                                                                                                                                                                        "childSettings":  [
@@ -674,7 +675,7 @@
                                                                                                                                                                                                                    },
                                                                                                                                                                                                                    {
                                                                                                                                                                                                                        "dataType":  0,
-                                                                                                                                                                                                                       "category":  43,
+                                                                                                                                                                                                                       "category":  46,
                                                                                                                                                                                                                        "nameResourceKey":  "kioskManagedHomeScreenPINRequiredToResumeName",
                                                                                                                                                                                                                        "descriptionResourceKey":  "kioskManagedHomeScreenPINRequiredToResumeDescription",
                                                                                                                                                                                                                        "childSettings":  [
@@ -701,13 +702,13 @@
                                                                                                                                                                                          },
                                                                                                                                                                                          {
                                                                                                                                                                                              "dataType":  0,
-                                                                                                                                                                                             "category":  43,
+                                                                                                                                                                                             "category":  46,
                                                                                                                                                                                              "nameResourceKey":  "kioskManagedHomeScreenAutoSignOutName",
                                                                                                                                                                                              "descriptionResourceKey":  "kioskManagedHomeScreenAutoSignOutDescription",
                                                                                                                                                                                              "childSettings":  [
                                                                                                                                                                                                                    {
                                                                                                                                                                                                                        "dataType":  14,
-                                                                                                                                                                                                                       "category":  43,
+                                                                                                                                                                                                                       "category":  46,
                                                                                                                                                                                                                        "nameResourceKey":  "kioskManagedHomeScreenInactiveSignOutDelayName",
                                                                                                                                                                                                                        "descriptionResourceKey":  "kioskManagedHomeScreenInactiveSignOutDelayDescription",
                                                                                                                                                                                                                        "emptyValueResourceKey":  "kioskScreenSaverSecondsEmptyValueKey",
@@ -725,7 +726,7 @@
                                                                                                                                                                                                                    },
                                                                                                                                                                                                                    {
                                                                                                                                                                                                                        "dataType":  14,
-                                                                                                                                                                                                                       "category":  43,
+                                                                                                                                                                                                                       "category":  46,
                                                                                                                                                                                                                        "nameResourceKey":  "kioskManagedHomeScreenInactiveNoticeDelayName",
                                                                                                                                                                                                                        "descriptionResourceKey":  "kioskManagedHomeScreenInactiveNoticeDelayDescription",
                                                                                                                                                                                                                        "emptyValueResourceKey":  "kioskScreenSaverSecondsEmptyValueKey",
@@ -765,7 +766,7 @@
                                                                                                                                               "enabled":  true
                                                                                                                                           }
                                                                                                                                       ],
-                                                                                                                          "entityKey":  "kioskMode",
+                                                                                                                          "entityKey":  "kioskModeUseManagedHomeScreenApp",
                                                                                                                           "booleanActions":  0,
                                                                                                                           "policyType":  2,
                                                                                                                           "enabled":  true
@@ -781,7 +782,7 @@
                                                                                                                           "isSettingDescription":  false,
                                                                                                                           "showAsSectionHeader":  false,
                                                                                                                           "dataType":  8,
-                                                                                                                          "category":  43,
+                                                                                                                          "category":  46,
                                                                                                                           "nameResourceKey":  "enrollmentProfileTypeFullyManagedConfigureMicrosoftLauncher",
                                                                                                                           "childSettings":  [
 
@@ -795,7 +796,7 @@
                                                                                                                       },
                                                                                                                       {
                                                                                                                           "dataType":  0,
-                                                                                                                          "category":  43,
+                                                                                                                          "category":  46,
                                                                                                                           "nameResourceKey":  "enrollmentProfileTypeFullyManagedMakeMicrosoftLauncherDefaultName",
                                                                                                                           "descriptionResourceKey":  "enrollmentProfileTypeFullyManagedMakeMicrosoftLauncherDefaultDescription",
                                                                                                                           "childSettings":  [
@@ -812,13 +813,13 @@
                                                                                                                       },
                                                                                                                       {
                                                                                                                           "dataType":  0,
-                                                                                                                          "category":  43,
+                                                                                                                          "category":  46,
                                                                                                                           "nameResourceKey":  "enrollmentProfileTypeFullyManagedMicrosoftLauncherConfigureCustomWallpaperName",
                                                                                                                           "descriptionResourceKey":  "enrollmentProfileTypeFullyManagedMicrosoftLauncherConfigureCustomWallpaperDescription",
                                                                                                                           "childSettings":  [
                                                                                                                                                 {
                                                                                                                                                     "dataType":  20,
-                                                                                                                                                    "category":  43,
+                                                                                                                                                    "category":  46,
                                                                                                                                                     "nameResourceKey":  "enrollmentProfileTypeFullyManagedMicrosoftLauncherConfigureCustomWallpaperUrlName",
                                                                                                                                                     "descriptionResourceKey":  "enrollmentProfileTypeFullyManagedMicrosoftLauncherConfigureCustomWallpaperUrlDescription",
                                                                                                                                                     "emptyValueResourceKey":  "enrollmentProfileTypeFullyManagedMicrosoftLauncherConfigureCustomWallpaperUrlEmptyValueKey",
@@ -835,7 +836,7 @@
                                                                                                                                                 },
                                                                                                                                                 {
                                                                                                                                                     "dataType":  0,
-                                                                                                                                                    "category":  43,
+                                                                                                                                                    "category":  46,
                                                                                                                                                     "nameResourceKey":  "enrollmentProfileTypeFullyManagedMicrosoftLauncherConfigureCustomWallpaperAllowUserModifyName",
                                                                                                                                                     "descriptionResourceKey":  "enrollmentProfileTypeFullyManagedMicrosoftLauncherConfigureCustomWallpaperAllowUserModifyDescription",
                                                                                                                                                     "childSettings":  [
@@ -862,13 +863,13 @@
                                                                                                                       },
                                                                                                                       {
                                                                                                                           "dataType":  0,
-                                                                                                                          "category":  43,
+                                                                                                                          "category":  46,
                                                                                                                           "nameResourceKey":  "enrollmentProfileTypeFullyManagedMicrosoftLauncherConfigureEnableLauncherFeedName",
                                                                                                                           "descriptionResourceKey":  "enrollmentProfileTypeFullyManagedMicrosoftLauncherConfigureEnableLauncherFeedDescription",
                                                                                                                           "childSettings":  [
                                                                                                                                                 {
                                                                                                                                                     "dataType":  0,
-                                                                                                                                                    "category":  43,
+                                                                                                                                                    "category":  46,
                                                                                                                                                     "nameResourceKey":  "enrollmentProfileTypeFullyManagedMicrosoftLauncherConfigureEnableLauncherFeedAllowUserModifyName",
                                                                                                                                                     "descriptionResourceKey":  "enrollmentProfileTypeFullyManagedMicrosoftLauncherConfigureEnableLauncherFeedAllowUserModifyDescription",
                                                                                                                                                     "childSettings":  [
@@ -895,13 +896,13 @@
                                                                                                                       },
                                                                                                                       {
                                                                                                                           "dataType":  16,
-                                                                                                                          "category":  43,
+                                                                                                                          "category":  46,
                                                                                                                           "nameResourceKey":  "enrollmentProfileTypeFullyManagedMicrosoftLauncherConfigureEnableLauncherDockPresenceName",
                                                                                                                           "descriptionResourceKey":  "enrollmentProfileTypeFullyManagedMicrosoftLauncherConfigureEnableLauncherDockPresenceDescription",
                                                                                                                           "childSettings":  [
                                                                                                                                                 {
                                                                                                                                                     "dataType":  0,
-                                                                                                                                                    "category":  43,
+                                                                                                                                                    "category":  46,
                                                                                                                                                     "nameResourceKey":  "enrollmentProfileTypeFullyManagedMicrosoftLauncherConfigureEnableLauncherDockPresenceAllowUserModifyName",
                                                                                                                                                     "descriptionResourceKey":  "enrollmentProfileTypeFullyManagedMicrosoftLauncherConfigureEnableLauncherDockPresenceAllowUserModifyDescription",
                                                                                                                                                     "childSettings":  [
@@ -945,7 +946,7 @@
                                                                                                                       },
                                                                                                                       {
                                                                                                                           "dataType":  16,
-                                                                                                                          "category":  43,
+                                                                                                                          "category":  46,
                                                                                                                           "nameResourceKey":  "enrollmentProfileTypeFullyManagedMicrosoftLauncherConfigureEnableLauncherSearchBarPlacementName",
                                                                                                                           "descriptionResourceKey":  "enrollmentProfileTypeFullyManagedMicrosoftLauncherConfigureEnableLauncherSearchBarPlacementDescription",
                                                                                                                           "childSettings":  [

Documentation/ObjectInfo/devicefirmwareconfigurationinterface_windows10devicefirmwareconfigurationinterface.json

@@ -1,383 +0,0 @@
-{
-    "devicefirmwareconfigurationinterface_windows10devicefirmwareconfigurationinterface":  [
-                                                                                               {
-                                                                                                   "isSettingDescription":  false,
-                                                                                                   "showAsSectionHeader":  false,
-                                                                                                   "dataType":  8,
-                                                                                                   "category":  136,
-                                                                                                   "nameResourceKey":  "dfciHeaderName",
-                                                                                                   "childSettings":  [
-
-                                                                                                                     ],
-                                                                                                   "options":  [
-
-                                                                                                               ],
-                                                                                                   "booleanActions":  0,
-                                                                                                   "policyType":  108,
-                                                                                                   "enabled":  true
-                                                                                               },
-                                                                                               {
-                                                                                                   "isSettingDescription":  false,
-                                                                                                   "showAsSectionHeader":  false,
-                                                                                                   "dataType":  8,
-                                                                                                   "category":  136,
-                                                                                                   "nameResourceKey":  "securityFeaturesName",
-                                                                                                   "childSettings":  [
-
-                                                                                                                     ],
-                                                                                                   "options":  [
-
-                                                                                                               ],
-                                                                                                   "booleanActions":  0,
-                                                                                                   "policyType":  108,
-                                                                                                   "enabled":  true
-                                                                                               },
-                                                                                               {
-                                                                                                   "dataType":  16,
-                                                                                                   "category":  136,
-                                                                                                   "nameResourceKey":  "changeUefiSettingsPermissionName",
-                                                                                                   "descriptionResourceKey":  "changeUefiSettingsPermissionDescription",
-                                                                                                   "childSettings":  [
-
-                                                                                                                     ],
-                                                                                                   "options":  [
-                                                                                                                   {
-                                                                                                                       "nameResourceKey":  "notConfiguredOnly",
-                                                                                                                       "value":  "notConfiguredOnly",
-                                                                                                                       "enabled":  true
-                                                                                                                   },
-                                                                                                                   {
-                                                                                                                       "nameResourceKey":  "none",
-                                                                                                                       "value":  "none",
-                                                                                                                       "enabled":  true
-                                                                                                                   }
-                                                                                                               ],
-                                                                                                   "entityKey":  "changeUefiSettingsPermission",
-                                                                                                   "booleanActions":  0,
-                                                                                                   "defaultValue":  "notConfiguredOnly",
-                                                                                                   "unconfiguredValue":  "notConfiguredOnly",
-                                                                                                   "policyType":  108,
-                                                                                                   "enabled":  true
-                                                                                               },
-                                                                                               {
-                                                                                                   "dataType":  16,
-                                                                                                   "category":  136,
-                                                                                                   "nameResourceKey":  "virtualizationOfCpuAndIOName",
-                                                                                                   "descriptionResourceKey":  "virtualizationOfCpuAndIODescription",
-                                                                                                   "childSettings":  [
-
-                                                                                                                     ],
-                                                                                                   "options":  [
-                                                                                                                   {
-                                                                                                                       "nameResourceKey":  "notConfigured",
-                                                                                                                       "value":  "notConfigured",
-                                                                                                                       "enabled":  true
-                                                                                                                   },
-                                                                                                                   {
-                                                                                                                       "nameResourceKey":  "enabledOption",
-                                                                                                                       "value":  "enabled",
-                                                                                                                       "enabled":  true
-                                                                                                                   },
-                                                                                                                   {
-                                                                                                                       "nameResourceKey":  "disabledOption",
-                                                                                                                       "value":  "disabled",
-                                                                                                                       "enabled":  true
-                                                                                                                   }
-                                                                                                               ],
-                                                                                                   "entityKey":  "virtualizationOfCpuAndIO",
-                                                                                                   "booleanActions":  0,
-                                                                                                   "defaultValue":  "notConfigured",
-                                                                                                   "unconfiguredValue":  "notConfigured",
-                                                                                                   "policyType":  108,
-                                                                                                   "enabled":  true
-                                                                                               },
-                                                                                               {
-                                                                                                   "dataType":  16,
-                                                                                                   "category":  136,
-                                                                                                   "nameResourceKey":  "windowsPlatformBinaryTableName",
-                                                                                                   "descriptionResourceKey":  "windowsPlatformBinaryTableDescription",
-                                                                                                   "childSettings":  [
-
-                                                                                                                     ],
-                                                                                                   "options":  [
-                                                                                                                   {
-                                                                                                                       "nameResourceKey":  "notConfigured",
-                                                                                                                       "value":  "notConfigured",
-                                                                                                                       "enabled":  true
-                                                                                                                   },
-                                                                                                                   {
-                                                                                                                       "nameResourceKey":  "enabledOption",
-                                                                                                                       "value":  "enabled",
-                                                                                                                       "enabled":  true
-                                                                                                                   },
-                                                                                                                   {
-                                                                                                                       "nameResourceKey":  "disabledOption",
-                                                                                                                       "value":  "disabled",
-                                                                                                                       "enabled":  true
-                                                                                                                   }
-                                                                                                               ],
-                                                                                                   "entityKey":  "windowsPlatformBinaryTable",
-                                                                                                   "booleanActions":  0,
-                                                                                                   "defaultValue":  "notConfigured",
-                                                                                                   "unconfiguredValue":  "notConfigured",
-                                                                                                   "policyType":  108,
-                                                                                                   "enabled":  false
-                                                                                               },
-                                                                                               {
-                                                                                                   "dataType":  16,
-                                                                                                   "category":  136,
-                                                                                                   "nameResourceKey":  "simultaneousMultiThreadingName",
-                                                                                                   "descriptionResourceKey":  "simultaneousMultiThreadingDescription",
-                                                                                                   "childSettings":  [
-
-                                                                                                                     ],
-                                                                                                   "options":  [
-                                                                                                                   {
-                                                                                                                       "nameResourceKey":  "notConfigured",
-                                                                                                                       "value":  "notConfigured",
-                                                                                                                       "enabled":  true
-                                                                                                                   },
-                                                                                                                   {
-                                                                                                                       "nameResourceKey":  "enabledOption",
-                                                                                                                       "value":  "enabled",
-                                                                                                                       "enabled":  true
-                                                                                                                   },
-                                                                                                                   {
-                                                                                                                       "nameResourceKey":  "disabledOption",
-                                                                                                                       "value":  "disabled",
-                                                                                                                       "enabled":  true
-                                                                                                                   }
-                                                                                                               ],
-                                                                                                   "entityKey":  "simultaneousMultiThreading",
-                                                                                                   "booleanActions":  0,
-                                                                                                   "defaultValue":  "notConfigured",
-                                                                                                   "unconfiguredValue":  "notConfigured",
-                                                                                                   "policyType":  108,
-                                                                                                   "enabled":  false
-                                                                                               },
-                                                                                               {
-                                                                                                   "isSettingDescription":  false,
-                                                                                                   "showAsSectionHeader":  false,
-                                                                                                   "dataType":  8,
-                                                                                                   "category":  136,
-                                                                                                   "nameResourceKey":  "builtInHardwareName",
-                                                                                                   "childSettings":  [
-
-                                                                                                                     ],
-                                                                                                   "options":  [
-
-                                                                                                               ],
-                                                                                                   "booleanActions":  0,
-                                                                                                   "policyType":  108,
-                                                                                                   "enabled":  true
-                                                                                               },
-                                                                                               {
-                                                                                                   "isSettingDescription":  false,
-                                                                                                   "showAsSectionHeader":  false,
-                                                                                                   "dataType":  8,
-                                                                                                   "category":  136,
-                                                                                                   "nameResourceKey":  "dfciBuiltinHeaderDescName",
-                                                                                                   "childSettings":  [
-
-                                                                                                                     ],
-                                                                                                   "options":  [
-
-                                                                                                               ],
-                                                                                                   "booleanActions":  0,
-                                                                                                   "policyType":  108,
-                                                                                                   "enabled":  true
-                                                                                               },
-                                                                                               {
-                                                                                                   "dataType":  16,
-                                                                                                   "category":  136,
-                                                                                                   "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":  16,
-                                                                                                   "category":  136,
-                                                                                                   "nameResourceKey":  "microphonesAndSpeakersName",
-                                                                                                   "descriptionResourceKey":  "microphonesAndSpeakersDescription",
-                                                                                                   "childSettings":  [
-
-                                                                                                                     ],
-                                                                                                   "options":  [
-                                                                                                                   {
-                                                                                                                       "nameResourceKey":  "notConfigured",
-                                                                                                                       "value":  "notConfigured",
-                                                                                                                       "enabled":  true
-                                                                                                                   },
-                                                                                                                   {
-                                                                                                                       "nameResourceKey":  "enabledOption",
-                                                                                                                       "value":  "enabled",
-                                                                                                                       "enabled":  true
-                                                                                                                   },
-                                                                                                                   {
-                                                                                                                       "nameResourceKey":  "disabledOption",
-                                                                                                                       "value":  "disabled",
-                                                                                                                       "enabled":  true
-                                                                                                                   }
-                                                                                                               ],
-                                                                                                   "entityKey":  "microphonesAndSpeakers",
-                                                                                                   "booleanActions":  0,
-                                                                                                   "defaultValue":  "notConfigured",
-                                                                                                   "unconfiguredValue":  "notConfigured",
-                                                                                                   "policyType":  108,
-                                                                                                   "enabled":  true
-                                                                                               },
-                                                                                               {
-                                                                                                   "dataType":  16,
-                                                                                                   "category":  136,
-                                                                                                   "nameResourceKey":  "radiosName",
-                                                                                                   "descriptionResourceKey":  "radiosDescription",
-                                                                                                   "childSettings":  [
-
-                                                                                                                     ],
-                                                                                                   "options":  [
-                                                                                                                   {
-                                                                                                                       "nameResourceKey":  "notConfigured",
-                                                                                                                       "value":  "notConfigured",
-                                                                                                                       "enabled":  true
-                                                                                                                   },
-                                                                                                                   {
-                                                                                                                       "nameResourceKey":  "enabledOption",
-                                                                                                                       "value":  "enabled",
-                                                                                                                       "enabled":  true
-                                                                                                                   },
-                                                                                                                   {
-                                                                                                                       "nameResourceKey":  "disabledOption",
-                                                                                                                       "value":  "disabled",
-                                                                                                                       "children":  [
-                                                                                                                                        {
-                                                                                                                                            "dataType":  10,
-                                                                                                                                            "category":  136,
-                                                                                                                                            "nameResourceKey":  "radioWarningInfoBox",
-                                                                                                                                            "childSettings":  [
-
-                                                                                                                                                              ],
-                                                                                                                                            "options":  [
-
-                                                                                                                                                        ],
-                                                                                                                                            "booleanActions":  0,
-                                                                                                                                            "policyType":  108,
-                                                                                                                                            "enabled":  true
-                                                                                                                                        }
-                                                                                                                                    ],
-                                                                                                                       "enabled":  true
-                                                                                                                   }
-                                                                                                               ],
-                                                                                                   "entityKey":  "radios",
-                                                                                                   "booleanActions":  0,
-                                                                                                   "defaultValue":  "notConfigured",
-                                                                                                   "unconfiguredValue":  "notConfigured",
-                                                                                                   "policyType":  108,
-                                                                                                   "enabled":  true
-                                                                                               },
-                                                                                               {
-                                                                                                   "isSettingDescription":  false,
-                                                                                                   "showAsSectionHeader":  false,
-                                                                                                   "dataType":  8,
-                                                                                                   "category":  136,
-                                                                                                   "nameResourceKey":  "bootOptionsName",
-                                                                                                   "childSettings":  [
-
-                                                                                                                     ],
-                                                                                                   "options":  [
-
-                                                                                                               ],
-                                                                                                   "booleanActions":  0,
-                                                                                                   "policyType":  108,
-                                                                                                   "enabled":  true
-                                                                                               },
-                                                                                               {
-                                                                                                   "dataType":  16,
-                                                                                                   "category":  136,
-                                                                                                   "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":  136,
-                                                                                                   "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/deviceguard_windows10endpointprotection.json

@@ -4,7 +4,7 @@
                                                         "isSettingDescription":  true,
                                                         "showAsSectionHeader":  false,
                                                         "dataType":  8,
-                                                        "category":  38,
+                                                        "category":  41,
                                                         "nameResourceKey":  "Windows10EndpointProtectionDeviceGuardLearnMore",
                                                         "childSettings":  [
 
@@ -18,7 +18,7 @@
                                                     },
                                                     {
                                                         "dataType":  16,
-                                                        "category":  38,
+                                                        "category":  41,
                                                         "nameResourceKey":  "Win10AppLockerEnforcementTypeName",
                                                         "descriptionResourceKey":  "Win10AppLockerEnforcementTypeDescription",
                                                         "childSettings":  [
@@ -36,7 +36,7 @@
                                                                             "children":  [
                                                                                              {
                                                                                                  "dataType":  16,
-                                                                                                 "category":  38,
+                                                                                                 "category":  41,
                                                                                                  "nameResourceKey":  "Win10AppLockerApplicationControlTypeName",
                                                                                                  "descriptionResourceKey":  "Win10appLockerApplicationControlAllowDescription",
                                                                                                  "childSettings":  [
@@ -51,7 +51,7 @@
                                                                                                                                           "isSettingDescription":  true,
                                                                                                                                           "showAsSectionHeader":  false,
                                                                                                                                           "dataType":  8,
-                                                                                                                                          "category":  38,
+                                                                                                                                          "category":  41,
                                                                                                                                           "nameResourceKey":  "Win10appLockerApplicationControlEnforceComponentsAndStoreAppsDescription",
                                                                                                                                           "childSettings":  [
 
@@ -74,7 +74,7 @@
                                                                                                                                           "isSettingDescription":  true,
                                                                                                                                           "showAsSectionHeader":  false,
                                                                                                                                           "dataType":  8,
-                                                                                                                                          "category":  38,
+                                                                                                                                          "category":  41,
                                                                                                                                           "nameResourceKey":  "Win10appLockerApplicationControlEnforceComponentsStoreAppsAndSmartlockerDescription",
                                                                                                                                           "childSettings":  [
 
@@ -106,7 +106,7 @@
                                                                             "children":  [
                                                                                              {
                                                                                                  "dataType":  16,
-                                                                                                 "category":  38,
+                                                                                                 "category":  41,
                                                                                                  "nameResourceKey":  "Win10AppLockerApplicationControlTypeName",
                                                                                                  "descriptionResourceKey":  "Win10AppLockerApplicationControlTypeAuditDescription",
                                                                                                  "childSettings":  [
@@ -121,7 +121,7 @@
                                                                                                                                           "isSettingDescription":  true,
                                                                                                                                           "showAsSectionHeader":  false,
                                                                                                                                           "dataType":  8,
-                                                                                                                                          "category":  38,
+                                                                                                                                          "category":  41,
                                                                                                                                           "nameResourceKey":  "Win10appLockerApplicationControlAuditComponentsAndStoreAppsDescription",
                                                                                                                                           "childSettings":  [
 
@@ -144,7 +144,7 @@
                                                                                                                                           "isSettingDescription":  true,
                                                                                                                                           "showAsSectionHeader":  false,
                                                                                                                                           "dataType":  8,
-                                                                                                                                          "category":  38,
+                                                                                                                                          "category":  41,
                                                                                                                                           "nameResourceKey":  "Win10appLockerApplicationControlAuditComponentsStoreAppsAndSmartlockerDescription",
                                                                                                                                           "childSettings":  [
 

Documentation/ObjectInfo/devicehealth_complianceandroid.json

@@ -2,7 +2,7 @@
     "devicehealth_complianceandroid":  [
                                            {
                                                "dataType":  0,
-                                               "category":  36,
+                                               "category":  39,
                                                "nameResourceKey":  "complianceBlockDAManagedDevicesName",
                                                "descriptionResourceKey":  "complianceBlockDAManagedDevicesDescription",
                                                "childSettings":  [
@@ -19,7 +19,7 @@
                                            },
                                            {
                                                "dataType":  0,
-                                               "category":  36,
+                                               "category":  39,
                                                "nameResourceKey":  "complianceRootedAllowedName",
                                                "descriptionResourceKey":  "complianceRootedAllowedDescription",
                                                "childSettings":  [
@@ -36,7 +36,7 @@
                                            },
                                            {
                                                "dataType":  16,
-                                               "category":  36,
+                                               "category":  39,
                                                "nameResourceKey":  "complianceDeviceThreatProtectionRequirementName",
                                                "descriptionResourceKey":  "complianceDeviceThreatProtectionRequirementDescription",
                                                "childSettings":  [
@@ -80,12 +80,12 @@
                                                "isSettingDescription":  false,
                                                "showAsSectionHeader":  false,
                                                "dataType":  8,
-                                               "category":  36,
+                                               "category":  39,
                                                "nameResourceKey":  "googlePlayProtectHeader",
                                                "childSettings":  [
                                                                      {
                                                                          "dataType":  0,
-                                                                         "category":  36,
+                                                                         "category":  39,
                                                                          "nameResourceKey":  "requireGooglePlayServicesName",
                                                                          "descriptionResourceKey":  "requireGooglePlayServicesDescription",
                                                                          "childSettings":  [
@@ -102,7 +102,7 @@
                                                                      },
                                                                      {
                                                                          "dataType":  0,
-                                                                         "category":  36,
+                                                                         "category":  39,
                                                                          "nameResourceKey":  "requireUpToDateSecurityProvidersName",
                                                                          "descriptionResourceKey":  "requireUpToDateSecurityProvidersDescription",
                                                                          "childSettings":  [
@@ -119,7 +119,7 @@
                                                                      },
                                                                      {
                                                                          "dataType":  0,
-                                                                         "category":  36,
+                                                                         "category":  39,
                                                                          "nameResourceKey":  "complianceSecurityEnableThreatScanOnAppsName",
                                                                          "descriptionResourceKey":  "complianceSecurityEnableThreatScanOnAppsDescription",
                                                                          "childSettings":  [
@@ -136,7 +136,7 @@
                                                                      },
                                                                      {
                                                                          "dataType":  0,
-                                                                         "category":  36,
+                                                                         "category":  39,
                                                                          "nameResourceKey":  "complianceSecurityEnableThreatScanOnAppsName",
                                                                          "descriptionResourceKey":  "complianceSecurityEnableThreatScanOnAppsDescription",
                                                                          "childSettings":  [
@@ -153,7 +153,7 @@
                                                                      },
                                                                      {
                                                                          "dataType":  16,
-                                                                         "category":  36,
+                                                                         "category":  39,
                                                                          "nameResourceKey":  "safetyNetAttestationOptionsName",
                                                                          "descriptionResourceKey":  "safetyNetAttestationOptionsDescription",
                                                                          "childSettings":  [

Documentation/ObjectInfo/devicehealth_complianceandroiddeviceowner.json

@@ -2,7 +2,7 @@
     "devicehealth_complianceandroiddeviceowner":  [
                                                       {
                                                           "dataType":  16,
-                                                          "category":  36,
+                                                          "category":  39,
                                                           "nameResourceKey":  "complianceDeviceThreatProtectionRequirementName",
                                                           "descriptionResourceKey":  "complianceDeviceThreatProtectionRequirementDescription",
                                                           "childSettings":  [
@@ -46,12 +46,12 @@
                                                           "isSettingDescription":  false,
                                                           "showAsSectionHeader":  false,
                                                           "dataType":  8,
-                                                          "category":  36,
+                                                          "category":  39,
                                                           "nameResourceKey":  "googlePlayProtectHeader",
                                                           "childSettings":  [
                                                                                 {
                                                                                     "dataType":  16,
-                                                                                    "category":  36,
+                                                                                    "category":  39,
                                                                                     "nameResourceKey":  "safetyNetAttestationOptionsName",
                                                                                     "descriptionResourceKey":  "safetyNetAttestationOptionsDescription",
                                                                                     "childSettings":  [

Documentation/ObjectInfo/devicehealth_complianceandroidforwork.json

@@ -2,7 +2,7 @@
     "devicehealth_complianceandroidforwork":  [
                                                   {
                                                       "dataType":  0,
-                                                      "category":  36,
+                                                      "category":  39,
                                                       "nameResourceKey":  "complianceRootedAllowedName",
                                                       "descriptionResourceKey":  "complianceRootedAllowedDescription",
                                                       "childSettings":  [
@@ -19,7 +19,7 @@
                                                   },
                                                   {
                                                       "dataType":  16,
-                                                      "category":  36,
+                                                      "category":  39,
                                                       "nameResourceKey":  "complianceDeviceThreatProtectionRequirementName",
                                                       "descriptionResourceKey":  "complianceDeviceThreatProtectionRequirementDescription",
                                                       "childSettings":  [
@@ -63,12 +63,12 @@
                                                       "isSettingDescription":  false,
                                                       "showAsSectionHeader":  false,
                                                       "dataType":  8,
-                                                      "category":  36,
+                                                      "category":  39,
                                                       "nameResourceKey":  "googlePlayProtectHeader",
                                                       "childSettings":  [
                                                                             {
                                                                                 "dataType":  0,
-                                                                                "category":  36,
+                                                                                "category":  39,
                                                                                 "nameResourceKey":  "requireGooglePlayServicesName",
                                                                                 "descriptionResourceKey":  "requireGooglePlayServicesDescription",
                                                                                 "childSettings":  [
@@ -85,7 +85,7 @@
                                                                             },
                                                                             {
                                                                                 "dataType":  0,
-                                                                                "category":  36,
+                                                                                "category":  39,
                                                                                 "nameResourceKey":  "requireUpToDateSecurityProvidersName",
                                                                                 "descriptionResourceKey":  "requireUpToDateSecurityProvidersDescription",
                                                                                 "childSettings":  [
@@ -102,7 +102,7 @@
                                                                             },
                                                                             {
                                                                                 "dataType":  16,
-                                                                                "category":  36,
+                                                                                "category":  39,
                                                                                 "nameResourceKey":  "safetyNetAttestationOptionsName",
                                                                                 "descriptionResourceKey":  "safetyNetAttestationOptionsDescription",
                                                                                 "childSettings":  [
@@ -120,7 +120,7 @@
                                                                                                     "children":  [
                                                                                                                      {
                                                                                                                          "dataType":  16,
-                                                                                                                         "category":  36,
+                                                                                                                         "category":  39,
                                                                                                                          "nameResourceKey":  "requiredAndroidSafetyNetEvaluationTypeName",
                                                                                                                          "descriptionResourceKey":  "requiredAndroidSafetyNetEvaluationTypeDescription",
                                                                                                                          "childSettings":  [
@@ -154,7 +154,7 @@
                                                                                                     "children":  [
                                                                                                                      {
                                                                                                                          "dataType":  16,
-                                                                                                                         "category":  36,
+                                                                                                                         "category":  39,
                                                                                                                          "nameResourceKey":  "requiredAndroidSafetyNetEvaluationTypeName",
                                                                                                                          "descriptionResourceKey":  "requiredAndroidSafetyNetEvaluationTypeDescription",
                                                                                                                          "childSettings":  [

Documentation/ObjectInfo/devicehealth_complianceaospdeviceowner.json

@@ -1,7 +1,7 @@
 {
     "devicehealth_complianceaospdeviceowner":  {
                                                    "dataType":  0,
-                                                   "category":  36,
+                                                   "category":  39,
                                                    "nameResourceKey":  "complianceRootedAllowedName",
                                                    "descriptionResourceKey":  "complianceRootedAllowedDescription",
                                                    "childSettings":  [

Documentation/ObjectInfo/devicehealth_complianceios.json

@@ -2,7 +2,7 @@
     "devicehealth_complianceios":  [
                                        {
                                            "dataType":  0,
-                                           "category":  36,
+                                           "category":  39,
                                            "nameResourceKey":  "complianceJailbreakAllowedName",
                                            "descriptionResourceKey":  "complianceJailbreakAllowedDescription",
                                            "childSettings":  [
@@ -19,7 +19,7 @@
                                        },
                                        {
                                            "dataType":  16,
-                                           "category":  36,
+                                           "category":  39,
                                            "nameResourceKey":  "complianceDeviceThreatProtectionRequirementName",
                                            "descriptionResourceKey":  "complianceDeviceThreatProtectionRequirementDescription",
                                            "childSettings":  [

Documentation/ObjectInfo/devicehealth_compliancemac.json

@@ -1,7 +1,7 @@
 {
     "devicehealth_compliancemac":  {
                                        "dataType":  0,
-                                       "category":  36,
+                                       "category":  39,
                                        "nameResourceKey":  "complianceSystemIntegrityProtectionName",
                                        "descriptionResourceKey":  "complianceSystemIntegrityProtectionDescription",
                                        "childSettings":  [

Documentation/ObjectInfo/devicehealth_compliancewindows10.json

@@ -3,12 +3,12 @@
                                              "isSettingDescription":  false,
                                              "showAsSectionHeader":  false,
                                              "dataType":  8,
-                                             "category":  36,
+                                             "category":  39,
                                              "nameResourceKey":  "complianceWindowsDeviceHealthAttestationHeader",
                                              "childSettings":  [
                                                                    {
                                                                        "dataType":  0,
-                                                                       "category":  36,
+                                                                       "category":  39,
                                                                        "nameResourceKey":  "bitLockerEnabledName",
                                                                        "descriptionResourceKey":  "bitLockerEnabledDescription",
                                                                        "childSettings":  [
@@ -25,7 +25,7 @@
                                                                    },
                                                                    {
                                                                        "dataType":  0,
-                                                                       "category":  36,
+                                                                       "category":  39,
                                                                        "nameResourceKey":  "secureBootEnabledName",
                                                                        "descriptionResourceKey":  "secureBootEnabledDescription",
                                                                        "childSettings":  [
@@ -42,7 +42,7 @@
                                                                    },
                                                                    {
                                                                        "dataType":  0,
-                                                                       "category":  36,
+                                                                       "category":  39,
                                                                        "nameResourceKey":  "codeIntegrityEnabledName",
                                                                        "descriptionResourceKey":  "codeIntegrityEnabledDescription",
                                                                        "childSettings":  [

Documentation/ObjectInfo/devicepassword_androiddeviceownergeneral.json

@@ -4,13 +4,13 @@
                                                          "isSettingDescription":  false,
                                                          "showAsSectionHeader":  true,
                                                          "dataType":  8,
-                                                         "category":  39,
+                                                         "category":  42,
                                                          "nameResourceKey":  "allAndroidCorpEnrollmentTypesHeaderName",
                                                          "descriptionResourceKey":  "allAndroidCorpEnrollmentTypesHeaderDescription",
                                                          "childSettings":  [
                                                                                {
                                                                                    "dataType":  16,
-                                                                                   "category":  39,
+                                                                                   "category":  42,
                                                                                    "nameResourceKey":  "requiredPasswordTypeName",
                                                                                    "descriptionResourceKey":  "androidEnterpriseRequiredPasswordTypeDescription",
                                                                                    "emptyValueResourceKey":  "passwordExpirationInDaysEmptyValueKey",
@@ -43,7 +43,7 @@
                                                                                                        "children":  [
                                                                                                                         {
                                                                                                                             "dataType":  14,
-                                                                                                                            "category":  39,
+                                                                                                                            "category":  42,
                                                                                                                             "nameResourceKey":  "complianceMinimumPasswordLengthName",
                                                                                                                             "descriptionResourceKey":  "passwordMinimumLengthDescription",
                                                                                                                             "emptyValueResourceKey":  "minimumPasswordLengthEmptyValueKeyFourToSixteen",
@@ -67,7 +67,7 @@
                                                                                                        "children":  [
                                                                                                                         {
                                                                                                                             "dataType":  14,
-                                                                                                                            "category":  39,
+                                                                                                                            "category":  42,
                                                                                                                             "nameResourceKey":  "complianceMinimumPasswordLengthName",
                                                                                                                             "descriptionResourceKey":  "passwordMinimumLengthDescription",
                                                                                                                             "emptyValueResourceKey":  "minimumPasswordLengthEmptyValueKeyFourToSixteen",
@@ -91,7 +91,7 @@
                                                                                                        "children":  [
                                                                                                                         {
                                                                                                                             "dataType":  14,
-                                                                                                                            "category":  39,
+                                                                                                                            "category":  42,
                                                                                                                             "nameResourceKey":  "complianceMinimumPasswordLengthName",
                                                                                                                             "descriptionResourceKey":  "passwordMinimumLengthDescription",
                                                                                                                             "emptyValueResourceKey":  "minimumPasswordLengthEmptyValueKeyFourToSixteen",
@@ -115,7 +115,7 @@
                                                                                                        "children":  [
                                                                                                                         {
                                                                                                                             "dataType":  14,
-                                                                                                                            "category":  39,
+                                                                                                                            "category":  42,
                                                                                                                             "nameResourceKey":  "complianceMinimumPasswordLengthName",
                                                                                                                             "descriptionResourceKey":  "passwordMinimumLengthDescription",
                                                                                                                             "emptyValueResourceKey":  "minimumPasswordLengthEmptyValueKeyFourToSixteen",
@@ -139,7 +139,7 @@
                                                                                                        "children":  [
                                                                                                                         {
                                                                                                                             "dataType":  14,
-                                                                                                                            "category":  39,
+                                                                                                                            "category":  42,
                                                                                                                             "nameResourceKey":  "complianceMinimumPasswordLengthName",
                                                                                                                             "descriptionResourceKey":  "passwordMinimumLengthDescription",
                                                                                                                             "emptyValueResourceKey":  "minimumPasswordLengthEmptyValueKeyFourToSixteen",
@@ -156,7 +156,7 @@
                                                                                                                         },
                                                                                                                         {
                                                                                                                             "dataType":  14,
-                                                                                                                            "category":  39,
+                                                                                                                            "category":  42,
                                                                                                                             "nameResourceKey":  "passwordMinimumLetterCharactersName",
                                                                                                                             "descriptionResourceKey":  "",
                                                                                                                             "emptyValueResourceKey":  "passwordEmptyValueKeyZeroToSixteen",
@@ -173,7 +173,7 @@
                                                                                                                         },
                                                                                                                         {
                                                                                                                             "dataType":  14,
-                                                                                                                            "category":  39,
+                                                                                                                            "category":  42,
                                                                                                                             "nameResourceKey":  "passwordMinimumLowerCaseCharactersName",
                                                                                                                             "descriptionResourceKey":  "",
                                                                                                                             "emptyValueResourceKey":  "passwordEmptyValueKeyZeroToSixteen",
@@ -190,7 +190,7 @@
                                                                                                                         },
                                                                                                                         {
                                                                                                                             "dataType":  14,
-                                                                                                                            "category":  39,
+                                                                                                                            "category":  42,
                                                                                                                             "nameResourceKey":  "passwordMinimumUpperCaseCharactersName",
                                                                                                                             "descriptionResourceKey":  "",
                                                                                                                             "emptyValueResourceKey":  "passwordEmptyValueKeyZeroToSixteen",
@@ -207,7 +207,7 @@
                                                                                                                         },
                                                                                                                         {
                                                                                                                             "dataType":  14,
-                                                                                                                            "category":  39,
+                                                                                                                            "category":  42,
                                                                                                                             "nameResourceKey":  "passwordMinimumNonLetterCharactersName",
                                                                                                                             "descriptionResourceKey":  "",
                                                                                                                             "emptyValueResourceKey":  "passwordEmptyValueKeyZeroToSixteen",
@@ -224,7 +224,7 @@
                                                                                                                         },
                                                                                                                         {
                                                                                                                             "dataType":  14,
-                                                                                                                            "category":  39,
+                                                                                                                            "category":  42,
                                                                                                                             "nameResourceKey":  "passwordMinimumNumericCharactersName",
                                                                                                                             "descriptionResourceKey":  "",
                                                                                                                             "emptyValueResourceKey":  "passwordEmptyValueKeyZeroToSixteen",
@@ -241,7 +241,7 @@
                                                                                                                         },
                                                                                                                         {
                                                                                                                             "dataType":  14,
-                                                                                                                            "category":  39,
+                                                                                                                            "category":  42,
                                                                                                                             "nameResourceKey":  "passwordMinimumSymbolCharactersName",
                                                                                                                             "descriptionResourceKey":  "passwordMinimumSymbolCharactersDescription",
                                                                                                                             "emptyValueResourceKey":  "passwordEmptyValueKeyZeroToSixteen",
@@ -265,7 +265,7 @@
                                                                                                        "children":  [
                                                                                                                         {
                                                                                                                             "dataType":  20,
-                                                                                                                            "category":  39,
+                                                                                                                            "category":  42,
                                                                                                                             "nameResourceKey":  "androidDeviceOwnerCustomPasswordName",
                                                                                                                             "descriptionResourceKey":  "androidDeviceOwnerCustomPasswordDescription",
                                                                                                                             "childSettings":  [
@@ -292,7 +292,7 @@
                                                                                },
                                                                                {
                                                                                    "dataType":  14,
-                                                                                   "category":  39,
+                                                                                   "category":  42,
                                                                                    "nameResourceKey":  "passwordExpirationName",
                                                                                    "descriptionResourceKey":  "passwordExpirationDescription",
                                                                                    "emptyValueResourceKey":  "passwordExpirationInDaysEmptyValueOneYearKey",
@@ -309,7 +309,7 @@
                                                                                },
                                                                                {
                                                                                    "dataType":  14,
-                                                                                   "category":  39,
+                                                                                   "category":  42,
                                                                                    "nameResourceKey":  "passwordPreviousPasswordBlockCountName",
                                                                                    "descriptionResourceKey":  "passwordPreviousPasswordBlockCountDescription",
                                                                                    "emptyValueResourceKey":  "numberOfPreviousPasswordsToBlockEmptyValueKey",
@@ -326,7 +326,7 @@
                                                                                },
                                                                                {
                                                                                    "dataType":  14,
-                                                                                   "category":  39,
+                                                                                   "category":  42,
                                                                                    "nameResourceKey":  "passwordSignInFailureCountBeforeFactoryResetName",
                                                                                    "descriptionResourceKey":  "passwordSignInFailureCountBeforeFactoryResetDescription",
                                                                                    "emptyValueResourceKey":  "passwordSignInFailureCountBeforeFactoryResetEmptyValueKey",
@@ -343,7 +343,7 @@
                                                                                },
                                                                                {
                                                                                    "dataType":  13,
-                                                                                   "category":  39,
+                                                                                   "category":  42,
                                                                                    "nameResourceKey":  "passwordBlockKeyguardFeaturesName",
                                                                                    "descriptionResourceKey":  "passwordBlockKeyguardFeaturesDescription",
                                                                                    "childSettings":  [
@@ -379,12 +379,58 @@
                                                                                                        "nameResourceKey":  "fingerprintOptionAndroid",
                                                                                                        "value":  "fingerprint",
                                                                                                        "enabled":  true
+                                                                                                   },
+                                                                                                   {
+                                                                                                       "nameResourceKey":  "faceOption",
+                                                                                                       "value":  "face",
+                                                                                                       "enabled":  true
+                                                                                                   },
+                                                                                                   {
+                                                                                                       "nameResourceKey":  "irisOption",
+                                                                                                       "value":  "iris",
+                                                                                                       "enabled":  true
+                                                                                                   },
+                                                                                                   {
+                                                                                                       "nameResourceKey":  "biometricsOption",
+                                                                                                       "value":  "biometrics",
+                                                                                                       "enabled":  true
+                                                                                                   },
+                                                                                                   {
+                                                                                                       "nameResourceKey":  "allFeaturesOption",
+                                                                                                       "value":  "allFeatures",
+                                                                                                       "enabled":  true
                                                                                                    }
                                                                                                ],
                                                                                    "entityKey":  "passwordBlockKeyguardFeaturesList",
                                                                                    "booleanActions":  0,
                                                                                    "policyType":  2,
                                                                                    "enabled":  true
+                                                                               },
+                                                                               {
+                                                                                   "dataType":  16,
+                                                                                   "category":  42,
+                                                                                   "nameResourceKey":  "requiredPasswordUnlockName",
+                                                                                   "childSettings":  [
+
+                                                                                                     ],
+                                                                                   "options":  [
+                                                                                                   {
+                                                                                                       "nameResourceKey":  "deviceDefault",
+                                                                                                       "value":  "deviceDefault",
+                                                                                                       "enabled":  true
+                                                                                                   },
+                                                                                                   {
+                                                                                                       "nameResourceKey":  "requiredPasswordUnlockDailyOption",
+                                                                                                       "value":  "daily",
+                                                                                                       "enabled":  true
+                                                                                                   }
+                                                                                               ],
+                                                                                   "entityKey":  "passwordRequireUnlock",
+                                                                                   "booleanActions":  0,
+                                                                                   "defaultValue":  "deviceDefault",
+                                                                                   "unconfiguredValue":  "deviceDefault",
+                                                                                   "policyType":  2,
+                                                                                   "enabled":  true
                                                                                }
                                                                            ],
                                                          "options":  [
@@ -398,13 +444,13 @@
                                                          "isSettingDescription":  false,
                                                          "showAsSectionHeader":  true,
                                                          "dataType":  8,
-                                                         "category":  39,
+                                                         "category":  42,
                                                          "nameResourceKey":  "fullyManagedAndDedicatedAndroidEnrollmentTypesHeaderName",
                                                          "descriptionResourceKey":  "fullyManagedAndDedicatedAndroidEnrollmentTypesHeaderDescription",
                                                          "childSettings":  [
                                                                                {
                                                                                    "dataType":  0,
-                                                                                   "category":  39,
+                                                                                   "category":  42,
                                                                                    "nameResourceKey":  "keyguardDisabledName",
                                                                                    "descriptionResourceKey":  "keyguardDisabledDescriptionAndroid",
                                                                                    "childSettings":  [

Documentation/ObjectInfo/devicepassword_aospdeviceownerdevice.json

@@ -2,7 +2,7 @@
     "devicepassword_aospdeviceownerdevice":  [
                                                  {
                                                      "dataType":  16,
-                                                     "category":  39,
+                                                     "category":  42,
                                                      "nameResourceKey":  "requiredPasswordTypeName",
                                                      "descriptionResourceKey":  "androidEnterpriseRequiredPasswordTypeDescription",
                                                      "emptyValueResourceKey":  "passwordExpirationInDaysEmptyValueKey",
@@ -35,7 +35,7 @@
                                                                          "children":  [
                                                                                           {
                                                                                               "dataType":  14,
-                                                                                              "category":  39,
+                                                                                              "category":  42,
                                                                                               "nameResourceKey":  "complianceMinimumPasswordLengthName",
                                                                                               "descriptionResourceKey":  "passwordMinimumLengthDescription",
                                                                                               "emptyValueResourceKey":  "minimumPasswordLengthEmptyValueKeyFourToSixteen",
@@ -59,7 +59,7 @@
                                                                          "children":  [
                                                                                           {
                                                                                               "dataType":  14,
-                                                                                              "category":  39,
+                                                                                              "category":  42,
                                                                                               "nameResourceKey":  "complianceMinimumPasswordLengthName",
                                                                                               "descriptionResourceKey":  "passwordMinimumLengthDescription",
                                                                                               "emptyValueResourceKey":  "minimumPasswordLengthEmptyValueKeyFourToSixteen",
@@ -83,7 +83,7 @@
                                                                          "children":  [
                                                                                           {
                                                                                               "dataType":  14,
-                                                                                              "category":  39,
+                                                                                              "category":  42,
                                                                                               "nameResourceKey":  "complianceMinimumPasswordLengthName",
                                                                                               "descriptionResourceKey":  "passwordMinimumLengthDescription",
                                                                                               "emptyValueResourceKey":  "minimumPasswordLengthEmptyValueKeyFourToSixteen",
@@ -107,7 +107,7 @@
                                                                          "children":  [
                                                                                           {
                                                                                               "dataType":  14,
-                                                                                              "category":  39,
+                                                                                              "category":  42,
                                                                                               "nameResourceKey":  "complianceMinimumPasswordLengthName",
                                                                                               "descriptionResourceKey":  "passwordMinimumLengthDescription",
                                                                                               "emptyValueResourceKey":  "minimumPasswordLengthEmptyValueKeyFourToSixteen",
@@ -131,7 +131,7 @@
                                                                          "children":  [
                                                                                           {
                                                                                               "dataType":  14,
-                                                                                              "category":  39,
+                                                                                              "category":  42,
                                                                                               "nameResourceKey":  "complianceMinimumPasswordLengthName",
                                                                                               "descriptionResourceKey":  "passwordMinimumLengthDescription",
                                                                                               "emptyValueResourceKey":  "minimumPasswordLengthEmptyValueKeyFourToSixteen",
@@ -159,7 +159,7 @@
                                                  },
                                                  {
                                                      "dataType":  14,
-                                                     "category":  39,
+                                                     "category":  42,
                                                      "nameResourceKey":  "passwordSignInFailureCountBeforeFactoryResetName",
                                                      "descriptionResourceKey":  "passwordSignInFailureCountBeforeFactoryResetDescription",
                                                      "emptyValueResourceKey":  "passwordSignInFailureCountBeforeFactoryResetEmptyValueKey",
@@ -176,7 +176,7 @@
                                                  },
                                                  {
                                                      "dataType":  16,
-                                                     "category":  39,
+                                                     "category":  42,
                                                      "nameResourceKey":  "minutesOfInactivityBeforeScreenTurnsOffName",
                                                      "descriptionResourceKey":  "minutesOfInactivityBeforeScreenTurnsOffDescription",
                                                      "childSettings":  [

Documentation/ObjectInfo/deviceproperties_complianceandroid.json

@@ -3,12 +3,12 @@
                                                "isSettingDescription":  false,
                                                "showAsSectionHeader":  false,
                                                "dataType":  8,
-                                               "category":  40,
+                                               "category":  43,
                                                "nameResourceKey":  "complianceOsVersionRestrictionHeader",
                                                "childSettings":  [
                                                                      {
                                                                          "dataType":  20,
-                                                                         "category":  40,
+                                                                         "category":  43,
                                                                          "nameResourceKey":  "complianceOsVersionRestrictionMinimumName",
                                                                          "descriptionResourceKey":  "complianceOsVersionRestrictionMinimumAndroidDescription",
                                                                          "childSettings":  [
@@ -24,7 +24,7 @@
                                                                      },
                                                                      {
                                                                          "dataType":  20,
-                                                                         "category":  40,
+                                                                         "category":  43,
                                                                          "nameResourceKey":  "complianceOsVersionRestrictionMaximumName",
                                                                          "descriptionResourceKey":  "complianceOsVersionRestrictionMaximumAndroidDescription",
                                                                          "childSettings":  [

Documentation/ObjectInfo/deviceproperties_complianceandroiddeviceowner.json

@@ -3,12 +3,12 @@
                                                           "isSettingDescription":  false,
                                                           "showAsSectionHeader":  false,
                                                           "dataType":  8,
-                                                          "category":  40,
+                                                          "category":  43,
                                                           "nameResourceKey":  "complianceOsVersionRestrictionHeader",
                                                           "childSettings":  [
                                                                                 {
                                                                                     "dataType":  20,
-                                                                                    "category":  40,
+                                                                                    "category":  43,
                                                                                     "nameResourceKey":  "complianceOsVersionRestrictionMinimumName",
                                                                                     "descriptionResourceKey":  "complianceOsVersionRestrictionMinimumAndroidDescription",
                                                                                     "childSettings":  [
@@ -24,7 +24,7 @@
                                                                                 },
                                                                                 {
                                                                                     "dataType":  20,
-                                                                                    "category":  40,
+                                                                                    "category":  43,
                                                                                     "nameResourceKey":  "complianceOsVersionRestrictionMaximumName",
                                                                                     "descriptionResourceKey":  "complianceOsVersionRestrictionMaximumAndroidDescription",
                                                                                     "childSettings":  [
@@ -40,7 +40,7 @@
                                                                                 },
                                                                                 {
                                                                                     "dataType":  20,
-                                                                                    "category":  40,
+                                                                                    "category":  43,
                                                                                     "nameResourceKey":  "complianceMinimumSecurityPatchLevelName",
                                                                                     "descriptionResourceKey":  "complianceMinimumSecurityPatchLevelDescription",
                                                                                     "childSettings":  [

Documentation/ObjectInfo/deviceproperties_complianceandroidforwork.json

@@ -3,12 +3,12 @@
                                                       "isSettingDescription":  false,
                                                       "showAsSectionHeader":  false,
                                                       "dataType":  8,
-                                                      "category":  40,
+                                                      "category":  43,
                                                       "nameResourceKey":  "complianceOsVersionRestrictionHeader",
                                                       "childSettings":  [
                                                                             {
                                                                                 "dataType":  20,
-                                                                                "category":  40,
+                                                                                "category":  43,
                                                                                 "nameResourceKey":  "complianceOsVersionRestrictionMinimumName",
                                                                                 "descriptionResourceKey":  "complianceOsVersionRestrictionMinimumAndroidDescription",
                                                                                 "childSettings":  [
@@ -24,7 +24,7 @@
                                                                             },
                                                                             {
                                                                                 "dataType":  20,
-                                                                                "category":  40,
+                                                                                "category":  43,
                                                                                 "nameResourceKey":  "complianceOsVersionRestrictionMaximumName",
                                                                                 "descriptionResourceKey":  "complianceOsVersionRestrictionMaximumAndroidDescription",
                                                                                 "childSettings":  [

Documentation/ObjectInfo/deviceproperties_complianceaospdeviceowner.json

@@ -3,12 +3,12 @@
                                                        "isSettingDescription":  false,
                                                        "showAsSectionHeader":  false,
                                                        "dataType":  8,
-                                                       "category":  40,
+                                                       "category":  43,
                                                        "nameResourceKey":  "complianceOsVersionRestrictionHeader",
                                                        "childSettings":  [
                                                                              {
                                                                                  "dataType":  20,
-                                                                                 "category":  40,
+                                                                                 "category":  43,
                                                                                  "nameResourceKey":  "complianceOsVersionRestrictionMinimumName",
                                                                                  "descriptionResourceKey":  "complianceOsVersionRestrictionMinimumAndroidDescription",
                                                                                  "childSettings":  [
@@ -24,7 +24,7 @@
                                                                              },
                                                                              {
                                                                                  "dataType":  20,
-                                                                                 "category":  40,
+                                                                                 "category":  43,
                                                                                  "nameResourceKey":  "complianceOsVersionRestrictionMaximumName",
                                                                                  "descriptionResourceKey":  "complianceOsVersionRestrictionMaximumAndroidDescription",
                                                                                  "childSettings":  [
@@ -40,7 +40,7 @@
                                                                              },
                                                                              {
                                                                                  "dataType":  20,
-                                                                                 "category":  40,
+                                                                                 "category":  43,
                                                                                  "nameResourceKey":  "complianceMinimumSecurityPatchLevelName",
                                                                                  "descriptionResourceKey":  "complianceMinimumSecurityPatchLevelDescription",
                                                                                  "childSettings":  [

Documentation/ObjectInfo/deviceproperties_complianceios.json

@@ -3,12 +3,12 @@
                                            "isSettingDescription":  false,
                                            "showAsSectionHeader":  false,
                                            "dataType":  8,
-                                           "category":  40,
+                                           "category":  43,
                                            "nameResourceKey":  "complianceOsVersionRestrictionHeader",
                                            "childSettings":  [
                                                                  {
                                                                      "dataType":  20,
-                                                                     "category":  40,
+                                                                     "category":  43,
                                                                      "nameResourceKey":  "complianceOsVersionRestrictionMinimumName",
                                                                      "descriptionResourceKey":  "complianceOsVersionRestrictionMinimumDescription",
                                                                      "childSettings":  [
@@ -24,7 +24,7 @@
                                                                  },
                                                                  {
                                                                      "dataType":  20,
-                                                                     "category":  40,
+                                                                     "category":  43,
                                                                      "nameResourceKey":  "complianceOsVersionRestrictionMaximumName",
                                                                      "descriptionResourceKey":  "complianceOsVersionRestrictionMaximumDescription",
                                                                      "childSettings":  [
@@ -40,7 +40,7 @@
                                                                  },
                                                                  {
                                                                      "dataType":  20,
-                                                                     "category":  40,
+                                                                     "category":  43,
                                                                      "nameResourceKey":  "complianceOsBuildVersionRestrictionMinimumName",
                                                                      "descriptionResourceKey":  "complianceOsBuildVersionRestrictionMinimumDescription",
                                                                      "childSettings":  [
@@ -56,7 +56,7 @@
                                                                  },
                                                                  {
                                                                      "dataType":  20,
-                                                                     "category":  40,
+                                                                     "category":  43,
                                                                      "nameResourceKey":  "complianceOsBuildVersionRestrictionMaximumName",
                                                                      "descriptionResourceKey":  "complianceOsBuildVersionRestrictionMaximumDescription",
                                                                      "childSettings":  [

Documentation/ObjectInfo/deviceproperties_compliancemac.json

@@ -3,12 +3,12 @@
                                            "isSettingDescription":  false,
                                            "showAsSectionHeader":  false,
                                            "dataType":  8,
-                                           "category":  40,
+                                           "category":  43,
                                            "nameResourceKey":  "complianceOsVersionRestrictionHeader",
                                            "childSettings":  [
                                                                  {
                                                                      "dataType":  20,
-                                                                     "category":  40,
+                                                                     "category":  43,
                                                                      "nameResourceKey":  "complianceOsVersionRestrictionMinimumName",
                                                                      "descriptionResourceKey":  "complianceOsVersionRestrictionMinimumDescription",
                                                                      "childSettings":  [
@@ -24,7 +24,7 @@
                                                                  },
                                                                  {
                                                                      "dataType":  20,
-                                                                     "category":  40,
+                                                                     "category":  43,
                                                                      "nameResourceKey":  "complianceOsVersionRestrictionMaximumName",
                                                                      "descriptionResourceKey":  "complianceOsVersionRestrictionMaximumDescription",
                                                                      "childSettings":  [
@@ -40,7 +40,7 @@
                                                                  },
                                                                  {
                                                                      "dataType":  20,
-                                                                     "category":  40,
+                                                                     "category":  43,
                                                                      "nameResourceKey":  "complianceOsBuildVersionRestrictionMinimumName",
                                                                      "descriptionResourceKey":  "complianceOsBuildVersionRestrictionMinimumDescription",
                                                                      "childSettings":  [
@@ -56,7 +56,7 @@
                                                                  },
                                                                  {
                                                                      "dataType":  20,
-                                                                     "category":  40,
+                                                                     "category":  43,
                                                                      "nameResourceKey":  "complianceOsBuildVersionRestrictionMaximumName",
                                                                      "descriptionResourceKey":  "complianceOsBuildVersionRestrictionMaximumDescription",
                                                                      "childSettings":  [

Documentation/ObjectInfo/deviceproperties_compliancewindows10.json

@@ -3,13 +3,13 @@
                                                  "isSettingDescription":  false,
                                                  "showAsSectionHeader":  false,
                                                  "dataType":  8,
-                                                 "category":  40,
+                                                 "category":  43,
                                                  "nameResourceKey":  "complianceOsVersionRestrictionHeader",
                                                  "descriptionResourceKey":  "complianceWindowsOsVersionRestrictionHeaderDescription",
                                                  "childSettings":  [
                                                                        {
                                                                            "dataType":  20,
-                                                                           "category":  40,
+                                                                           "category":  43,
                                                                            "nameResourceKey":  "complianceOsVersionRestrictionMinimumName",
                                                                            "descriptionResourceKey":  "complianceWindowsOsVersionRestrictionMinimumDescription",
                                                                            "childSettings":  [
@@ -25,7 +25,7 @@
                                                                        },
                                                                        {
                                                                            "dataType":  20,
-                                                                           "category":  40,
+                                                                           "category":  43,
                                                                            "nameResourceKey":  "complianceOsVersionRestrictionMaximumName",
                                                                            "descriptionResourceKey":  "complianceWindowsOsVersionRestrictionMaximumDescription",
                                                                            "childSettings":  [
@@ -41,7 +41,7 @@
                                                                        },
                                                                        {
                                                                            "dataType":  16,
-                                                                           "category":  40,
+                                                                           "category":  43,
                                                                            "nameResourceKey":  "minimumUpdateAutoInstallClassificationName",
                                                                            "descriptionResourceKey":  "minimumUpdateAutoInstallClassificationDescription",
                                                                            "childSettings":  [
@@ -70,7 +70,7 @@
                                                                        },
                                                                        {
                                                                            "dataType":  20,
-                                                                           "category":  40,
+                                                                           "category":  43,
                                                                            "nameResourceKey":  "complianceMobileOsVersionRestrictionMinimumName",
                                                                            "descriptionResourceKey":  "complianceWindowsMobileOsVersionRestrictionMinimumDescription",
                                                                            "childSettings":  [
@@ -86,7 +86,7 @@
                                                                        },
                                                                        {
                                                                            "dataType":  20,
-                                                                           "category":  40,
+                                                                           "category":  43,
                                                                            "nameResourceKey":  "complianceMobileOsVersionRestrictionMaximumName",
                                                                            "descriptionResourceKey":  "complianceWindowsMobileOsVersionRestrictionMaximumDescription",
                                                                            "childSettings":  [
@@ -105,7 +105,7 @@
                                                                                            {
                                                                                                "metadata":  {
                                                                                                                 "dataType":  20,
-                                                                                                                "category":  40,
+                                                                                                                "category":  43,
                                                                                                                 "nameResourceKey":  "ValidOperatingSystemBuildsDescriptionName",
                                                                                                                 "descriptionResourceKey":  "empty",
                                                                                                                 "childSettings":  [
@@ -123,7 +123,7 @@
                                                                                            {
                                                                                                "metadata":  {
                                                                                                                 "dataType":  20,
-                                                                                                                "category":  40,
+                                                                                                                "category":  43,
                                                                                                                 "nameResourceKey":  "ValidOperatingSystemBuildsMinimumName",
                                                                                                                 "descriptionResourceKey":  "empty",
                                                                                                                 "childSettings":  [
@@ -141,7 +141,7 @@
                                                                                            {
                                                                                                "metadata":  {
                                                                                                                 "dataType":  20,
-                                                                                                                "category":  40,
+                                                                                                                "category":  43,
                                                                                                                 "nameResourceKey":  "ValidOperatingSystemBuildsMaximumName",
                                                                                                                 "descriptionResourceKey":  "empty",
                                                                                                                 "childSettings":  [
@@ -158,7 +158,7 @@
                                                                                            }
                                                                                        ],
                                                                            "dataType":  21,
-                                                                           "category":  40,
+                                                                           "category":  43,
                                                                            "nameResourceKey":  "ValidOperatingSystemBuildsName",
                                                                            "descriptionResourceKey":  "empty",
                                                                            "childSettings":  [

Documentation/ObjectInfo/deviceproperties_compliancewindows8.json

@@ -3,13 +3,13 @@
                                                 "isSettingDescription":  false,
                                                 "showAsSectionHeader":  false,
                                                 "dataType":  8,
-                                                "category":  40,
+                                                "category":  43,
                                                 "nameResourceKey":  "complianceOsVersionRestrictionHeader",
                                                 "descriptionResourceKey":  "complianceWindowsOsVersionRestrictionHeaderDescription",
                                                 "childSettings":  [
                                                                       {
                                                                           "dataType":  20,
-                                                                          "category":  40,
+                                                                          "category":  43,
                                                                           "nameResourceKey":  "complianceOsVersionRestrictionMinimumName",
                                                                           "descriptionResourceKey":  "complianceWindowsOsVersionRestrictionMinimumDescription",
                                                                           "childSettings":  [
@@ -25,7 +25,7 @@
                                                                       },
                                                                       {
                                                                           "dataType":  20,
-                                                                          "category":  40,
+                                                                          "category":  43,
                                                                           "nameResourceKey":  "complianceOsVersionRestrictionMaximumName",
                                                                           "descriptionResourceKey":  "complianceWindowsOsVersionRestrictionMaximumDescription",
                                                                           "childSettings":  [
@@ -41,7 +41,7 @@
                                                                       },
                                                                       {
                                                                           "dataType":  16,
-                                                                          "category":  40,
+                                                                          "category":  43,
                                                                           "nameResourceKey":  "minimumUpdateAutoInstallClassificationName",
                                                                           "descriptionResourceKey":  "minimumUpdateAutoInstallClassificationDescription",
                                                                           "childSettings":  [

Documentation/ObjectInfo/deviceproperties_compliancewindowsphone.json

@@ -3,13 +3,13 @@
                                                     "isSettingDescription":  false,
                                                     "showAsSectionHeader":  false,
                                                     "dataType":  8,
-                                                    "category":  40,
+                                                    "category":  43,
                                                     "nameResourceKey":  "complianceOsVersionRestrictionHeader",
                                                     "descriptionResourceKey":  "complianceWindowsOsVersionRestrictionHeaderDescription",
                                                     "childSettings":  [
                                                                           {
                                                                               "dataType":  20,
-                                                                              "category":  40,
+                                                                              "category":  43,
                                                                               "nameResourceKey":  "complianceMobileOsVersionRestrictionMinimumName",
                                                                               "descriptionResourceKey":  "complianceWindowsMobileOsVersionRestrictionMinimumDescription",
                                                                               "childSettings":  [
@@ -25,7 +25,7 @@
                                                                           },
                                                                           {
                                                                               "dataType":  20,
-                                                                              "category":  40,
+                                                                              "category":  43,
                                                                               "nameResourceKey":  "complianceMobileOsVersionRestrictionMaximumName",
                                                                               "descriptionResourceKey":  "complianceWindowsMobileOsVersionRestrictionMaximumDescription",
                                                                               "childSettings":  [

Documentation/ObjectInfo/devicerestrictions_androiddeviceownergeneral.json

@@ -4,7 +4,7 @@
                                                              "isSettingDescription":  false,
                                                              "showAsSectionHeader":  false,
                                                              "dataType":  8,
-                                                             "category":  41,
+                                                             "category":  44,
                                                              "nameResourceKey":  "workProfileHeaderDescription",
                                                              "descriptionResourceKey":  "",
                                                              "childSettings":  [
@@ -21,13 +21,13 @@
                                                              "isSettingDescription":  false,
                                                              "showAsSectionHeader":  true,
                                                              "dataType":  8,
-                                                             "category":  41,
+                                                             "category":  44,
                                                              "nameResourceKey":  "allAndroidCorpEnrollmentTypesHeaderName",
                                                              "descriptionResourceKey":  "allAndroidCorpEnrollmentTypesHeaderDescription",
                                                              "childSettings":  [
                                                                                    {
                                                                                        "dataType":  0,
-                                                                                       "category":  41,
+                                                                                       "category":  44,
                                                                                        "nameResourceKey":  "screenCaptureDisabledNameWorkProfile",
                                                                                        "descriptionResourceKey":  "screenCaptureDisabledDescription",
                                                                                        "childSettings":  [
@@ -44,7 +44,7 @@
                                                                                    },
                                                                                    {
                                                                                        "dataType":  0,
-                                                                                       "category":  41,
+                                                                                       "category":  44,
                                                                                        "nameResourceKey":  "cameraDisabledNameWorkProfile",
                                                                                        "descriptionResourceKey":  "cameraDisabledDescription",
                                                                                        "childSettings":  [
@@ -61,7 +61,7 @@
                                                                                    },
                                                                                    {
                                                                                        "dataType":  16,
-                                                                                       "category":  41,
+                                                                                       "category":  44,
                                                                                        "nameResourceKey":  "defaultPermissionPolicyNameWorkProfile",
                                                                                        "descriptionResourceKey":  "defaultPermissionPolicyDescription",
                                                                                        "childSettings":  [
@@ -98,7 +98,7 @@
                                                                                    },
                                                                                    {
                                                                                        "dataType":  0,
-                                                                                       "category":  41,
+                                                                                       "category":  44,
                                                                                        "nameResourceKey":  "dateTimeConfigurationBlockedName",
                                                                                        "descriptionResourceKey":  "dateTimeConfigurationBlockedDescription",
                                                                                        "childSettings":  [
@@ -115,24 +115,7 @@
                                                                                    },
                                                                                    {
                                                                                        "dataType":  0,
-                                                                                       "category":  41,
+                                                                                       "category":  44,
-                                                                                       "nameResourceKey":  "safeBootDisabledName",
-                                                                                       "descriptionResourceKey":  "safeBootDisabledDescription",
-                                                                                       "childSettings":  [
-
-                                                                                                         ],
-                                                                                       "options":  [
-
-                                                                                                   ],
-                                                                                       "entityKey":  "safeBootBlocked",
-                                                                                       "booleanActions":  3,
-                                                                                       "defaultValue":  false,
-                                                                                       "policyType":  2,
-                                                                                       "enabled":  true
-                                                                                   },
-                                                                                   {
-                                                                                       "dataType":  0,
-                                                                                       "category":  41,
                                                                                        "nameResourceKey":  "dataRoamingBlockedName",
                                                                                        "descriptionResourceKey":  "dataRoamingBlockedDescription",
                                                                                        "childSettings":  [
@@ -149,7 +132,7 @@
                                                                                    },
                                                                                    {
                                                                                        "dataType":  0,
-                                                                                       "category":  41,
+                                                                                       "category":  44,
                                                                                        "nameResourceKey":  "wifiConfigDisabledName",
                                                                                        "descriptionResourceKey":  "wifiConfigDisabledDescription",
                                                                                        "childSettings":  [
@@ -166,7 +149,7 @@
                                                                                    },
                                                                                    {
                                                                                        "dataType":  0,
-                                                                                       "category":  41,
+                                                                                       "category":  44,
                                                                                        "nameResourceKey":  "bluetoothBlockConfigurationName",
                                                                                        "descriptionResourceKey":  "bluetoothBlockConfigurationDescription",
                                                                                        "childSettings":  [
@@ -183,7 +166,7 @@
                                                                                    },
                                                                                    {
                                                                                        "dataType":  0,
-                                                                                       "category":  41,
+                                                                                       "category":  44,
                                                                                        "nameResourceKey":  "cellularBlockWiFiTetheringName",
                                                                                        "descriptionResourceKey":  "cellularBlockWiFiTetheringDescription",
                                                                                        "childSettings":  [
@@ -200,7 +183,7 @@
                                                                                    },
                                                                                    {
                                                                                        "dataType":  0,
-                                                                                       "category":  41,
+                                                                                       "category":  44,
                                                                                        "nameResourceKey":  "storageBlockUsbFileTransferName",
                                                                                        "descriptionResourceKey":  "storageBlockUsbFileTransferDescription",
                                                                                        "childSettings":  [
@@ -217,7 +200,7 @@
                                                                                    },
                                                                                    {
                                                                                        "dataType":  0,
-                                                                                       "category":  41,
+                                                                                       "category":  44,
                                                                                        "nameResourceKey":  "storageBlockExternalMediaName",
                                                                                        "descriptionResourceKey":  "storageBlockExternalMediaDescription",
                                                                                        "childSettings":  [
@@ -234,7 +217,7 @@
                                                                                    },
                                                                                    {
                                                                                        "dataType":  0,
-                                                                                       "category":  41,
+                                                                                       "category":  44,
                                                                                        "nameResourceKey":  "nfcBlockOutgoingBeamNameWorkProfile",
                                                                                        "descriptionResourceKey":  "nfcBlockOutgoingBeamDescription",
                                                                                        "childSettings":  [
@@ -251,24 +234,7 @@
                                                                                    },
                                                                                    {
                                                                                        "dataType":  0,
-                                                                                       "category":  41,
+                                                                                       "category":  44,
-                                                                                       "nameResourceKey":  "debuggingFeaturesAllowedName",
-                                                                                       "descriptionResourceKey":  "debuggingFeaturesAllowedDescription",
-                                                                                       "childSettings":  [
-
-                                                                                                         ],
-                                                                                       "options":  [
-
-                                                                                                   ],
-                                                                                       "entityKey":  "securityAllowDebuggingFeatures",
-                                                                                       "booleanActions":  0,
-                                                                                       "defaultValue":  false,
-                                                                                       "policyType":  2,
-                                                                                       "enabled":  true
-                                                                                   },
-                                                                                   {
-                                                                                       "dataType":  0,
-                                                                                       "category":  41,
                                                                                        "nameResourceKey":  "securityDeveloperSettingsEnabledName",
                                                                                        "descriptionResourceKey":  "securityDeveloperSettingsEnabledDescription",
                                                                                        "childSettings":  [
@@ -285,7 +251,7 @@
                                                                                    },
                                                                                    {
                                                                                        "dataType":  0,
-                                                                                       "category":  41,
+                                                                                       "category":  44,
                                                                                        "nameResourceKey":  "unmuteMicrophoneDisabledName",
                                                                                        "descriptionResourceKey":  "unmuteMicrophoneDisabledDescription",
                                                                                        "childSettings":  [
@@ -302,7 +268,7 @@
                                                                                    },
                                                                                    {
                                                                                        "dataType":  16,
-                                                                                       "category":  41,
+                                                                                       "category":  44,
                                                                                        "nameResourceKey":  "factoryResetProtectionEmailsName",
                                                                                        "descriptionResourceKey":  "factoryResetProtectionEmailsDescription",
                                                                                        "childSettings":  [
@@ -320,7 +286,7 @@
                                                                                                            "children":  [
                                                                                                                             {
                                                                                                                                 "dataType":  20,
-                                                                                                                                "category":  41,
+                                                                                                                                "category":  44,
                                                                                                                                 "nameResourceKey":  "googleAccountEmailAddressesName",
                                                                                                                                 "descriptionResourceKey":  "googleAccountEmailAddressesDescription",
                                                                                                                                 "childSettings":  [
@@ -347,7 +313,7 @@
                                                                                    },
                                                                                    {
                                                                                        "dataType":  16,
-                                                                                       "category":  41,
+                                                                                       "category":  44,
                                                                                        "nameResourceKey":  "systemUpdateInstallName",
                                                                                        "descriptionResourceKey":  "systemUpdateInstallDescription",
                                                                                        "childSettings":  [
@@ -375,7 +341,7 @@
                                                                                                            "children":  [
                                                                                                                             {
                                                                                                                                 "dataType":  16,
-                                                                                                                                "category":  41,
+                                                                                                                                "category":  44,
                                                                                                                                 "nameResourceKey":  "systemUpdateOptionWindowStartTimeName",
                                                                                                                                 "descriptionResourceKey":  "systemUpdateOptionWindowStartTimeDescription",
                                                                                                                                 "childSettings":  [
@@ -631,7 +597,7 @@
                                                                                                                             },
                                                                                                                             {
                                                                                                                                 "dataType":  16,
-                                                                                                                                "category":  41,
+                                                                                                                                "category":  44,
                                                                                                                                 "nameResourceKey":  "systemUpdateOptionWindowEndTimeName",
                                                                                                                                 "descriptionResourceKey":  "systemUpdateOptionWindowEndTimeDescription",
                                                                                                                                 "childSettings":  [
@@ -895,6 +861,62 @@
                                                                                        "unconfiguredValue":  "deviceDefault",
                                                                                        "policyType":  2,
                                                                                        "enabled":  true
+                                                                                   },
+                                                                                   {
+                                                                                       "columns":  [
+                                                                                                       {
+                                                                                                           "metadata":  {
+                                                                                                                            "dataType":  20,
+                                                                                                                            "category":  44,
+                                                                                                                            "nameResourceKey":  "systemUpdateFreezePeriodStartDateColumnName",
+                                                                                                                            "descriptionResourceKey":  "systemUpdateFreezePeriodStartDateColumnDescription",
+                                                                                                                            "emptyValueResourceKey":  "systemUpdateFreezePeriodStartDateEmptyValueKey",
+                                                                                                                            "childSettings":  [
+
+                                                                                                                                              ],
+                                                                                                                            "options":  [
+
+                                                                                                                                        ],
+                                                                                                                            "entityKey":  "startDate",
+                                                                                                                            "booleanActions":  0,
+                                                                                                                            "policyType":  2,
+                                                                                                                            "enabled":  true
+                                                                                                                        }
+                                                                                                       },
+                                                                                                       {
+                                                                                                           "metadata":  {
+                                                                                                                            "dataType":  20,
+                                                                                                                            "category":  44,
+                                                                                                                            "nameResourceKey":  "systemUpdateFreezePeriodEndDateColumnName",
+                                                                                                                            "descriptionResourceKey":  "systemUpdateFreezePeriodEndDateColumnDescription",
+                                                                                                                            "emptyValueResourceKey":  "systemUpdateFreezePeriodEndDateEmptyValueKey",
+                                                                                                                            "childSettings":  [
+
+                                                                                                                                              ],
+                                                                                                                            "options":  [
+
+                                                                                                                                        ],
+                                                                                                                            "entityKey":  "endDate",
+                                                                                                                            "booleanActions":  0,
+                                                                                                                            "policyType":  2,
+                                                                                                                            "enabled":  true
+                                                                                                                        }
+                                                                                                       }
+                                                                                                   ],
+                                                                                       "dataType":  21,
+                                                                                       "category":  44,
+                                                                                       "nameResourceKey":  "systemUpdateFreezePeriodsTableName",
+                                                                                       "descriptionResourceKey":  "systemUpdateFreezePeriodsTableDescription",
+                                                                                       "childSettings":  [
+
+                                                                                                         ],
+                                                                                       "options":  [
+
+                                                                                                   ],
+                                                                                       "entityKey":  "systemUpdateFreezePeriodsList",
+                                                                                       "booleanActions":  0,
+                                                                                       "policyType":  2,
+                                                                                       "enabled":  true
                                                                                    }
                                                                                ],
                                                              "options":  [
@@ -908,13 +930,13 @@
                                                              "isSettingDescription":  false,
                                                              "showAsSectionHeader":  true,
                                                              "dataType":  8,
-                                                             "category":  41,
+                                                             "category":  44,
                                                              "nameResourceKey":  "fullyManagedAndDedicatedAndroidEnrollmentTypesHeaderName",
                                                              "descriptionResourceKey":  "fullyManagedAndDedicatedAndroidEnrollmentTypesHeaderDescription",
                                                              "childSettings":  [
                                                                                    {
                                                                                        "dataType":  0,
-                                                                                       "category":  41,
+                                                                                       "category":  44,
                                                                                        "nameResourceKey":  "adjustVolumeDisabledName",
                                                                                        "descriptionResourceKey":  "adjustVolumeDisabledDescription",
                                                                                        "childSettings":  [
@@ -931,7 +953,7 @@
                                                                                    },
                                                                                    {
                                                                                        "dataType":  0,
-                                                                                       "category":  41,
+                                                                                       "category":  44,
                                                                                        "nameResourceKey":  "factoryResetDisabledName",
                                                                                        "descriptionResourceKey":  "factoryResetDisabledDescription",
                                                                                        "childSettings":  [
@@ -948,7 +970,7 @@
                                                                                    },
                                                                                    {
                                                                                        "dataType":  0,
-                                                                                       "category":  41,
+                                                                                       "category":  44,
                                                                                        "nameResourceKey":  "statusBarDisabledName",
                                                                                        "descriptionResourceKey":  "statusBarDisabledDescription",
                                                                                        "childSettings":  [
@@ -965,7 +987,7 @@
                                                                                    },
                                                                                    {
                                                                                        "dataType":  0,
-                                                                                       "category":  41,
+                                                                                       "category":  44,
                                                                                        "nameResourceKey":  "wifiConfigsLockdownEnabledName",
                                                                                        "descriptionResourceKey":  "wifiConfigsLockdownEnabledDescription",
                                                                                        "childSettings":  [
@@ -982,7 +1004,7 @@
                                                                                    },
                                                                                    {
                                                                                        "dataType":  0,
-                                                                                       "category":  41,
+                                                                                       "category":  44,
                                                                                        "nameResourceKey":  "storageAllowUsbName",
                                                                                        "descriptionResourceKey":  "storageAllowUsbDescription",
                                                                                        "childSettings":  [
@@ -999,7 +1021,7 @@
                                                                                    },
                                                                                    {
                                                                                        "dataType":  0,
-                                                                                       "category":  41,
+                                                                                       "category":  44,
                                                                                        "nameResourceKey":  "networkEscapeHatchName",
                                                                                        "descriptionResourceKey":  "networkEscapeHatchDescription",
                                                                                        "childSettings":  [
@@ -1016,7 +1038,7 @@
                                                                                    },
                                                                                    {
                                                                                        "dataType":  0,
-                                                                                       "category":  41,
+                                                                                       "category":  44,
                                                                                        "nameResourceKey":  "systemWindowsBlockedName",
                                                                                        "descriptionResourceKey":  "systemWindowsBlockedDescription",
                                                                                        "childSettings":  [
@@ -1033,7 +1055,7 @@
                                                                                    },
                                                                                    {
                                                                                        "dataType":  0,
-                                                                                       "category":  41,
+                                                                                       "category":  44,
                                                                                        "nameResourceKey":  "appsRecommendSkippingFirstUseHintsName",
                                                                                        "descriptionResourceKey":  "appsRecommendSkippingFirstUseHintsDescription",
                                                                                        "childSettings":  [
@@ -1060,13 +1082,47 @@
                                                              "isSettingDescription":  false,
                                                              "showAsSectionHeader":  true,
                                                              "dataType":  8,
-                                                             "category":  41,
+                                                             "category":  44,
+                                                             "nameResourceKey":  "fullyManagedAndCorporateOwnedWorkProfileAndroidEnrollmentTypesHeaderName",
+                                                             "descriptionResourceKey":  "fullyManagedAndCorporateOwnedWorkProfileAndroidEnrollmentTypesHeaderDescription",
+                                                             "childSettings":  [
+                                                                                   {
+                                                                                       "dataType":  0,
+                                                                                       "category":  44,
+                                                                                       "nameResourceKey":  "androidDeviceOwnerLocateDeviceName",
+                                                                                       "descriptionResourceKey":  "androidDeviceOwnerLocateDeviceLostModeEnabledDescription",
+                                                                                       "childSettings":  [
+
+                                                                                                         ],
+                                                                                       "options":  [
+
+                                                                                                   ],
+                                                                                       "entityKey":  "locateDeviceLostModeEnabled",
+                                                                                       "booleanActions":  0,
+                                                                                       "defaultValue":  false,
+                                                                                       "unconfiguredValue":  false,
+                                                                                       "policyType":  2,
+                                                                                       "enabled":  false
+                                                                                   }
+                                                                               ],
+                                                             "options":  [
+
+                                                                         ],
+                                                             "booleanActions":  0,
+                                                             "policyType":  2,
+                                                             "enabled":  true
+                                                         },
+                                                         {
+                                                             "isSettingDescription":  false,
+                                                             "showAsSectionHeader":  true,
+                                                             "dataType":  8,
+                                                             "category":  44,
                                                              "nameResourceKey":  "dedicatedAndroidEnrollmentTypesHeaderName",
                                                              "descriptionResourceKey":  "dedicatedAndroidEnrollmentTypesHeaderDescription",
                                                              "childSettings":  [
                                                                                    {
                                                                                        "dataType":  0,
-                                                                                       "category":  41,
+                                                                                       "category":  44,
                                                                                        "nameResourceKey":  "androidEnterprisePowerButtonActionsBlockedName",
                                                                                        "descriptionResourceKey":  "androidEnterprisePowerButtonActionsBlockedDescription",
                                                                                        "childSettings":  [
@@ -1083,7 +1139,7 @@
                                                                                    },
                                                                                    {
                                                                                        "dataType":  0,
-                                                                                       "category":  41,
+                                                                                       "category":  44,
                                                                                        "nameResourceKey":  "androidEnterpriseSystemErrorWarningsEnabledName",
                                                                                        "descriptionResourceKey":  "androidEnterpriseSystemErrorWarningsEnabledDescription",
                                                                                        "childSettings":  [
@@ -1100,7 +1156,7 @@
                                                                                    },
                                                                                    {
                                                                                        "dataType":  16,
-                                                                                       "category":  41,
+                                                                                       "category":  44,
                                                                                        "nameResourceKey":  "androidEnterpriseSystemNavigationName",
                                                                                        "descriptionResourceKey":  "androidEnterpriseSystemNavigationDescription",
                                                                                        "childSettings":  [
@@ -1132,7 +1188,7 @@
                                                                                    },
                                                                                    {
                                                                                        "dataType":  16,
-                                                                                       "category":  41,
+                                                                                       "category":  44,
                                                                                        "nameResourceKey":  "androidEnterpriseStatusBarName",
                                                                                        "descriptionResourceKey":  "androidEnterpriseStatusBarDescription",
                                                                                        "childSettings":  [
@@ -1164,7 +1220,7 @@
                                                                                    },
                                                                                    {
                                                                                        "dataType":  0,
-                                                                                       "category":  41,
+                                                                                       "category":  44,
                                                                                        "nameResourceKey":  "androidEnterpriseDeviceSettingsBlockedName",
                                                                                        "descriptionResourceKey":  "androidEnterpriseDeviceSettingsBlockedDescription",
                                                                                        "childSettings":  [
@@ -1178,6 +1234,24 @@
                                                                                        "defaultValue":  false,
                                                                                        "policyType":  2,
                                                                                        "enabled":  false
+                                                                                   },
+                                                                                   {
+                                                                                       "dataType":  0,
+                                                                                       "category":  44,
+                                                                                       "nameResourceKey":  "androidDeviceOwnerLocateDeviceName",
+                                                                                       "descriptionResourceKey":  "androidDeviceOwnerLocateDeviceUserlessDisabledDescription",
+                                                                                       "childSettings":  [
+
+                                                                                                         ],
+                                                                                       "options":  [
+
+                                                                                                   ],
+                                                                                       "entityKey":  "locateDeviceUserlessDisabled",
+                                                                                       "booleanActions":  3,
+                                                                                       "defaultValue":  false,
+                                                                                       "unconfiguredValue":  false,
+                                                                                       "policyType":  2,
+                                                                                       "enabled":  false
                                                                                    }
                                                                                ],
                                                              "options":  [
@@ -1191,13 +1265,13 @@
                                                              "isSettingDescription":  false,
                                                              "showAsSectionHeader":  true,
                                                              "dataType":  8,
-                                                             "category":  41,
+                                                             "category":  44,
                                                              "nameResourceKey":  "workProfileAndroidEnrollmentTypesHeaderName",
                                                              "descriptionResourceKey":  "workProfileAndroidEnrollmentTypesHeaderDescription",
                                                              "childSettings":  [
                                                                                    {
                                                                                        "dataType":  0,
-                                                                                       "category":  41,
+                                                                                       "category":  44,
                                                                                        "nameResourceKey":  "workProfileBlockContactSharingViaBluetoothName",
                                                                                        "descriptionResourceKey":  "workProfileBlockContactSharingViaBluetoothDescription",
                                                                                        "childSettings":  [
@@ -1211,6 +1285,87 @@
                                                                                        "defaultValue":  false,
                                                                                        "policyType":  2,
                                                                                        "enabled":  true
+                                                                                   },
+                                                                                   {
+                                                                                       "dataType":  19,
+                                                                                       "category":  44,
+                                                                                       "nameResourceKey":  "showWorkContactsInPersonalProfileName",
+                                                                                       "descriptionResourceKey":  "showWorkContactsInPersonalProfileDescription",
+                                                                                       "childSettings":  [
+
+                                                                                                         ],
+                                                                                       "options":  [
+                                                                                                       {
+                                                                                                           "nameResourceKey":  "blockOption",
+                                                                                                           "value":  false,
+                                                                                                           "enabled":  true
+                                                                                                       },
+                                                                                                       {
+                                                                                                           "nameResourceKey":  "notConfigured",
+                                                                                                           "value":  true,
+                                                                                                           "enabled":  true
+                                                                                                       }
+                                                                                                   ],
+                                                                                       "entityKey":  "crossProfilePoliciesShowWorkContactsInPersonalProfile",
+                                                                                       "booleanActions":  0,
+                                                                                       "defaultValue":  true,
+                                                                                       "unconfiguredValue":  true,
+                                                                                       "policyType":  2,
+                                                                                       "enabled":  true
+                                                                                   },
+                                                                                   {
+                                                                                       "dataType":  0,
+                                                                                       "category":  44,
+                                                                                       "nameResourceKey":  "copyPasteBetweenWorkAndPersonalProfilesName",
+                                                                                       "descriptionResourceKey":  "copyPasteBetweenWorkAndPersonalProfilesDescription",
+                                                                                       "childSettings":  [
+
+                                                                                                         ],
+                                                                                       "options":  [
+
+                                                                                                   ],
+                                                                                       "entityKey":  "crossProfilePoliciesAllowCopyPaste",
+                                                                                       "booleanActions":  0,
+                                                                                       "defaultValue":  false,
+                                                                                       "policyType":  2,
+                                                                                       "enabled":  true
+                                                                                   },
+                                                                                   {
+                                                                                       "dataType":  16,
+                                                                                       "category":  44,
+                                                                                       "nameResourceKey":  "dataSharingBetweenWorkAndPersonalProfilesName",
+                                                                                       "descriptionResourceKey":  "dataSharingBetweenWorkAndPersonalProfilesDescription",
+                                                                                       "childSettings":  [
+
+                                                                                                         ],
+                                                                                       "options":  [
+                                                                                                       {
+                                                                                                           "nameResourceKey":  "DeviceDefaultDataSharingBetweenWorkAndPersonalProfilesOption",
+                                                                                                           "value":  "notConfigured",
+                                                                                                           "enabled":  true
+                                                                                                       },
+                                                                                                       {
+                                                                                                           "nameResourceKey":  "BlockAllDataSharingBetweenWorkAndPersonalProfilesOption",
+                                                                                                           "value":  "crossProfileDataSharingBlocked",
+                                                                                                           "enabled":  true
+                                                                                                       },
+                                                                                                       {
+                                                                                                           "nameResourceKey":  "BlockWorkToPersonalDataSharingBetweenWorkAndPersonalProfilesOption",
+                                                                                                           "value":  "dataSharingFromWorkToPersonalBlocked",
+                                                                                                           "enabled":  true
+                                                                                                       },
+                                                                                                       {
+                                                                                                           "nameResourceKey":  "NoRestrictionsDataSharingBetweenWorkAndPersonalProfilesOption",
+                                                                                                           "value":  "crossProfileDataSharingAllowed",
+                                                                                                           "enabled":  true
+                                                                                                       }
+                                                                                                   ],
+                                                                                       "entityKey":  "crossProfilePoliciesAllowDataSharing",
+                                                                                       "booleanActions":  0,
+                                                                                       "defaultValue":  "notConfigured",
+                                                                                       "unconfiguredValue":  "notConfigured",
+                                                                                       "policyType":  2,
+                                                                                       "enabled":  true
                                                                                    }
                                                                                ],
                                                              "options":  [