Restore LF line endings in Core.psm1 and EndpointManager.psm1

The commit for issue #428 re-saved both files with CRLF, so every line showed
as changed against master, which stores them with LF like the rest of the
repository. Content is untouched; only the line endings return to LF.

.github/DISCUSSION_TEMPLATE/ideas.yml

@@ -0,0 +1,39 @@
+title: ""
+body:
+  - type: markdown
+    attributes:
+      value: |
+        Ideas is for shaping something before it becomes a request. Say what you
+        are trying to achieve rather than the control you picture, and it will be
+        clear whether the application should grow a feature or already has one.
+
+  - type: dropdown
+    id: version
+    attributes:
+      label: Which version are you using?
+      options:
+        - 4.0 beta
+        - 3.x
+        - Neither yet, just looking
+    validations:
+      required: true
+
+  - type: textarea
+    id: goal
+    attributes:
+      label: What are you trying to achieve?
+    validations:
+      required: true
+
+  - type: textarea
+    id: idea
+    attributes:
+      label: How do you picture it working?
+
+  - type: textarea
+    id: scale
+    attributes:
+      label: How often, and at what scale?
+      description: >
+        How many tenants, how many policies, how often you do it. Scale changes
+        the answer more than anything else here.

.github/DISCUSSION_TEMPLATE/q-a.yml

@@ -0,0 +1,64 @@
+title: "[Question] "
+labels: ["needs-triage"]
+body:
+  - type: markdown
+    attributes:
+      value: |
+        Most questions here turn out to be one of four things: a sign-in method
+        the embedded window cannot complete, a list that looks short because the
+        version you are on stops paging, a permission the app registration does
+        not hold, or an object type that has no public Graph endpoint. The fields
+        below let that be spotted straight away.
+
+  - type: dropdown
+    id: version
+    attributes:
+      label: Version
+      options:
+        - 4.0 beta
+        - 3.x
+    validations:
+      required: true
+
+  - type: dropdown
+    id: signin
+    attributes:
+      label: How do you sign in?
+      options:
+        - Interactive, embedded window (the default in v3)
+        - Interactive, Web Account Manager (WAM)
+        - Interactive, system browser (the default in v4)
+        - Device code
+        - Application and secret
+        - Application and certificate
+        - Managed identity or federated credential
+        - Bring your own token
+    validations:
+      required: true
+
+  - type: dropdown
+    id: cloud
+    attributes:
+      label: Cloud
+      options:
+        - Public (commercial)
+        - US Government (GCC High)
+        - US Government (DoD)
+        - China (21Vianet)
+    validations:
+      required: true
+
+  - type: textarea
+    id: question
+    attributes:
+      label: What are you trying to do?
+    validations:
+      required: true
+
+  - type: textarea
+    id: tried
+    attributes:
+      label: What have you tried, and what happened?
+      description: >
+        Paste any error text here. **Remove tenant identifiers, user names and
+        tokens first.**

.github/FUNDING.yml

@@ -0,0 +1,4 @@
+# GitHub renders this as the "Sponsor" button on the repository page
+# (public repositories, default branch). Buy Me a Coffee takes the
+# username, not the URL: https://buymeacoffee.com/MickeK
+buy_me_a_coffee: MickeK

.github/ISSUE_TEMPLATE/bug-v3.yml

@@ -0,0 +1,116 @@
+name: Bug report (version 3.x)
+description: Something is wrong in the current release. Windows only.
+title: "[3.x] "
+labels: ["bug", "v3", "needs-triage"]
+body:
+  - type: markdown
+    attributes:
+      value: |
+        Version 3 stays supported until 4.0 leaves beta.
+
+        Before filing, check whether 4.0 already fixes it. Several long-standing
+        reports here are addressed there: sign-in with passkeys and other
+        phishing-resistant methods, lists that stopped at 20, 100 or a few
+        hundred objects, sovereign cloud sign-in, and running without a user
+        present. The 4.0 beta lives on the `v4` branch.
+
+  - type: checkboxes
+    id: preflight
+    attributes:
+      label: Before reporting
+      options:
+        - label: >
+            If my sign-in involves a passkey, security key, Windows Hello or a
+            phishing-resistant policy: I know the embedded sign-in window cannot
+            complete those, and I have said so below rather than reporting it as
+            a broken login.
+          required: true
+        - label: >
+            I searched existing issues and discussions, including closed ones.
+          required: true
+
+  - type: input
+    id: version
+    attributes:
+      label: Version
+      placeholder: 3.10.3
+    validations:
+      required: true
+
+  - type: dropdown
+    id: signin
+    attributes:
+      label: How did you sign in?
+      options:
+        - Interactive, embedded window (the default)
+        - Interactive, other
+        - Application and secret
+        - Application and certificate
+        - Not signed in / sign-in is the problem
+    validations:
+      required: true
+
+  - type: dropdown
+    id: cloud
+    attributes:
+      label: Cloud
+      options:
+        - Public (commercial)
+        - US Government (GCC High)
+        - US Government (DoD)
+        - China (21Vianet)
+    validations:
+      required: true
+
+  - type: input
+    id: powershell
+    attributes:
+      label: PowerShell version
+      description: Run `$PSVersionTable.PSVersion`.
+      placeholder: "5.1.22621.4391"
+    validations:
+      required: true
+
+  - type: dropdown
+    id: area
+    attributes:
+      label: Which part of the application?
+      options:
+        - Sign-in and authentication
+        - Export
+        - Import
+        - Copy
+        - Compare
+        - Documentation output
+        - Assignments, groups or filters
+        - Bulk or silent operations
+        - ADMX or tools
+        - The user interface itself
+        - Something else
+    validations:
+      required: true
+
+  - type: textarea
+    id: what
+    attributes:
+      label: What happened, and what did you expect instead?
+    validations:
+      required: true
+
+  - type: textarea
+    id: steps
+    attributes:
+      label: Steps to reproduce
+    validations:
+      required: true
+
+  - type: textarea
+    id: log
+    attributes:
+      label: Log
+      description: >
+        The relevant lines, or the error text. **Remove tenant identifiers, user
+        names, access tokens and secrets before pasting.**
+      render: text
+    validations:
+      required: true

.github/ISSUE_TEMPLATE/bug-v4.yml

@@ -0,0 +1,154 @@
+name: Bug report (version 4.0 beta)
+description: Something is wrong in 4.0. Runs on Windows, macOS and Linux.
+title: "[4.0] "
+labels: ["bug", "v4", "needs-triage"]
+body:
+  - type: markdown
+    attributes:
+      value: |
+        Thanks for testing the beta. Four fields below do most of the work:
+        **how you signed in**, **which cloud**, **which operating system** and
+        **the log**. Reports without them usually need a round trip before
+        anything can happen.
+
+  - type: checkboxes
+    id: preflight
+    attributes:
+      label: Before reporting
+      description: These three cover the majority of beta reports so far.
+      options:
+        - label: >
+            I read the release notes for this beta, including the breaking changes.
+          required: true
+        - label: >
+            If my sign-in involves a passkey, security key, Windows Hello or any
+            phishing-resistant policy: I enabled **Use Web Account Manager (WAM)
+            for login** or **Use system browser for login** in Settings, and tried
+            again. The embedded window cannot complete those methods.
+          required: true
+        - label: >
+            My problem is not Inventory Policies returning 403. That endpoint is
+            not published on the public Graph API, so the application cannot read
+            it with a normal sign-in. It is a Microsoft limitation, not a bug.
+            A bring-your-own-token sign-in can reach it.
+          required: true
+
+  - type: input
+    id: version
+    attributes:
+      label: Version
+      description: The About dialog, or the ModuleVersion in IntuneManagement.psd1.
+      placeholder: 4.0.0-beta1
+    validations:
+      required: true
+
+  - type: dropdown
+    id: signin
+    attributes:
+      label: How did you sign in?
+      description: >
+        The single most useful field in this form. Roughly a third of all reports
+        on this project have turned out to be sign-in behaviour rather than the
+        feature being reported.
+      options:
+        - Interactive, embedded window
+        - Interactive, Web Account Manager (WAM)
+        - Interactive, system browser (the default)
+        - Device code
+        - Application and secret
+        - Application and certificate
+        - Managed identity or federated credential
+        - Bring your own token
+        - Not signed in / sign-in is the problem
+    validations:
+      required: true
+
+  - type: dropdown
+    id: cloud
+    attributes:
+      label: Cloud
+      options:
+        - Public (commercial)
+        - US Government (GCC High)
+        - US Government (DoD)
+        - China (21Vianet)
+    validations:
+      required: true
+
+  - type: dropdown
+    id: os
+    attributes:
+      label: Operating system
+      description: 4.0 runs the full application outside Windows, so this now matters.
+      options:
+        - Windows
+        - macOS (Apple Silicon)
+        - macOS (Intel)
+        - Linux
+    validations:
+      required: true
+
+  - type: input
+    id: powershell
+    attributes:
+      label: PowerShell edition and version
+      description: Run `$PSVersionTable.PSVersion` and `$PSVersionTable.PSEdition`.
+      placeholder: "7.4.6, Core"
+    validations:
+      required: true
+
+  - type: dropdown
+    id: area
+    attributes:
+      label: Which part of the application?
+      options:
+        - Sign-in and authentication
+        - Export
+        - Import
+        - Copy
+        - Compare
+        - Documentation output
+        - Assignments, groups or filters
+        - Bulk operations
+        - ADMX or tools
+        - The user interface itself
+        - Automation through the PowerShell commands
+        - Something else
+    validations:
+      required: true
+
+  - type: input
+    id: objecttype
+    attributes:
+      label: Which object type, if it is specific to one
+      placeholder: Settings Catalog, Conditional Access, Win32 app, ...
+
+  - type: textarea
+    id: what
+    attributes:
+      label: What happened, and what did you expect instead?
+    validations:
+      required: true
+
+  - type: textarea
+    id: steps
+    attributes:
+      label: Steps to reproduce
+      placeholder: |
+        1. Sign in to ...
+        2. Open ...
+        3. Click ...
+    validations:
+      required: true
+
+  - type: textarea
+    id: log
+    attributes:
+      label: Log
+      description: >
+        The relevant lines from the log file, or the error text. **Remove tenant
+        identifiers, user names, access tokens and secrets before pasting.** If
+        an exported policy file is needed, redact it or use one from a lab tenant.
+      render: text
+    validations:
+      required: true

.github/ISSUE_TEMPLATE/config.yml

@@ -0,0 +1,17 @@
+# Turns off the "open a blank issue" escape hatch, so every report arrives
+# through a form with the fields that make it answerable. Questions go to
+# Discussions, which is where most of them already end up.
+blank_issues_enabled: false
+contact_links:
+  - name: Question, or not sure it is a bug
+    url: https://github.com/Micke-K/IntuneManagement/discussions/categories/q-a
+    about: Ask in Q&A. Most "it does not show my policies" reports are answered there in a day.
+  - name: Feature idea worth discussing first
+    url: https://github.com/Micke-K/IntuneManagement/discussions/categories/ideas
+    about: Ideas that are still taking shape belong here. A concrete request can go straight to an issue.
+  - name: Version 4.0 beta feedback
+    url: https://github.com/Micke-K/IntuneManagement/discussions/categories/announcements
+    about: Testing the 4.0 beta? Start at the pinned announcement, which lists what to try first.
+  - name: Security vulnerability
+    url: https://github.com/Micke-K/IntuneManagement/security/advisories/new
+    about: Never report a security problem in a public issue. Use private reporting.

.github/ISSUE_TEMPLATE/feature.yml

@@ -0,0 +1,71 @@
+name: Feature request
+description: Something the application should do and does not.
+title: "[Request] "
+labels: ["enhancement", "needs-triage"]
+body:
+  - type: markdown
+    attributes:
+      value: |
+        If the idea is still taking shape, [Ideas in
+        Discussions](https://github.com/Micke-K/IntuneManagement/discussions/categories/ideas)
+        is the better room. Use this form when you can describe the outcome you
+        want.
+
+  - type: dropdown
+    id: version
+    attributes:
+      label: Which version is this for?
+      description: >
+        This one is read by a human, not by automation, so say what you mean.
+        A request that 4.0 already covers is worth checking against the release
+        notes first.
+      options:
+        - Version 4.0
+        - Version 3.x
+        - Either
+    validations:
+      required: true
+
+  - type: textarea
+    id: problem
+    attributes:
+      label: What are you trying to do?
+      description: >
+        The situation, not the solution. "I move policies between two tenants
+        every month and have to redo the assignments by hand" tells more than
+        "add a button".
+    validations:
+      required: true
+
+  - type: textarea
+    id: proposal
+    attributes:
+      label: What would you like it to do?
+    validations:
+      required: true
+
+  - type: textarea
+    id: workaround
+    attributes:
+      label: How do you handle it today?
+      description: Including "not at all", which is useful to know.
+
+  - type: dropdown
+    id: area
+    attributes:
+      label: Which part of the application?
+      options:
+        - Export
+        - Import
+        - Copy
+        - Compare
+        - Documentation output
+        - Assignments, groups or filters
+        - Bulk operations
+        - ADMX or tools
+        - The user interface
+        - Automation through the PowerShell commands
+        - A policy type that is not supported yet
+        - Something else
+    validations:
+      required: true

.github/pull_request_template.md

@@ -0,0 +1,47 @@
+<!--
+  Target branch
+
+    Fixing version 3?  target  Development
+    Fixing version 4?  target  v4
+
+  A pull request opened against the default branch is retargeted to
+  Development before review. Use the Edit button next to the title.
+-->
+
+<!--
+  How version 4 changes are applied during the beta
+
+  Version 4 is developed elsewhere and the v4 branch is published as one
+  snapshot per release, not as a running history. An accepted change is
+  applied upstream and appears in the next release, so your commit will not
+  show up in this branch. You are credited in the release notes instead.
+  Nothing is lost, and nothing needs doing on your side.
+-->
+
+## What does this change?
+
+<!-- One or two sentences. What was wrong, or what is now possible. -->
+
+## Related issue
+
+<!-- "Fixes #123", or "none" if there isn't one. -->
+
+## How was it tested?
+
+<!--
+  Which version, which cloud, and which operating system, since 4.0 runs on
+  three. If it touches sign-in, say which method you used: embedded window,
+  Web Account Manager, system browser, device code, or an application identity.
+-->
+
+- Version:
+- Cloud:
+- Operating system and PowerShell version:
+- Tests run:
+
+## Anything a reviewer should know
+
+<!--
+  Behaviour that changes for existing users, a setting that moves, a file format
+  that shifts. Say so here rather than leaving it to be discovered.
+-->

.gitignore

@@ -4,4 +4,12 @@
 /*.Log
 /*.Lo_
 /*.csv
-
+/*.zip
+/*.new
+/*.old
+/Extensions/*.zip
+Extensions_dev/
+.gitignore
+CloudAPIPowerShellManagement.log
+AGENTS.md
+CLAUDE.md

ADMXImport.md

@@ -12,27 +12,27 @@ Microsoft links:
 
 ## ADMX Import
 
-The **ADMX Import** tool is used for configuring 3rd party applications e.g. Chrome, Google Update etc., These ADMX files are available from the software vendor. An ADMX can be loaded in the tool and all settings can be configured using a similar UI as GPMC. When the ADMX is loaded, the script will look for an ADML file that is either in the same directory or in the en-US subdirectory. An ADML file can also be loaded manually, if another language should be used in the UI.
+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. 
 
 The *Intune OMA-URI name* property specifies the name of the OMA-URI row in the Custom Profile. This is optional and if it is not specified, the script will use the name of the policy.
 
-A policy must be set to Enabled before any changes can be made. The *Policy* tab will list all possible settings for the policy. This could be a dropdown box, text box, check box, numeric up-down box etc. The script creates the controls based on the presentation settings in the ADML file. An ADML is not mandatory but the controls and the UI could cause unpredictive results. Always use the associated ADML for correctly generated controls.
+A policy must be set to Enabled before any changes can be made. The *Policy* tab will list all possible settings for the policy. This could be a dropdown box, text box, check box, numeric up-down box etc. The script creates the controls based on the presentation settings in the ADML file. An ADML is not mandatory but the controls and the UI could cause unpredictable results. Always use the associated ADML for correctly generated controls.
 
-![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 *OMA-URI Settings* tab contains the configured settings. This is the string that will be added to the enabled policy. This can be manually configured in case there is something that is not supported by the script. Do **NOT** add <enabled /> or <disabled /> to this text box. The script will add that automatically.  If *Manual configuration* is checked, the script will upload the text as it is specified, including additional manual changes. If it is not checked, the script will generate the text when importing the profile. If manual configuration is added and then checkbox is cleared, those changes will be lost during the upload.
 
 The *XML Definition* tab contains the XML node for the ADMX policy. This is used for reference in case manual configuration is required.
 
-![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**
 

CS/HttpFactoryWithProxy.cs

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

CloudAPIPowerShellManagement.psm1

@@ -69,14 +69,99 @@ function Initialize-CloudAPIManagement
         [string]
         $View = "",
         [switch]
-        $ShowConsoleWindow
+        $ShowConsoleWindow,
+        [switch]
+        $JSonSettings,
+        [string]
+        $JSonFile,
+        [switch]
+        $Silent,
+        [string]
+        $SilentBatchFile,
+        [string]
+        $tenantId,
+        [string]
+        $appId,
+        [string]
+        $secret,
+        [string]
+        $certificate,
+        [string]
+        $GraphEnvironment,
+        [string]
+        $GCCType
+
     )
 
+    $PSModuleAutoloadingPreference = "none"
+
     $global:wpfNS = "xmlns='http://schemas.microsoft.com/winfx/2006/xaml/presentation' xmlns:x='http://schemas.microsoft.com/winfx/2006/xaml'"
 
     [void] [System.Reflection.Assembly]::LoadWithPartialName("System.Windows.Forms") 
     Add-Type -AssemblyName PresentationFramework
 
+    [Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12
+
+    $global:hideUI = ($Silent -eq $true)
+    $global:SilentBatchFile = $SilentBatchFile
+
+    if($tenantId)
+    {
+        Write-Host "Using Tenant Id: $tenantId"
+        $global:AzureAppId = $appId 
+        $global:ClientSecret = $secret 
+        $global:ClientCert = $certificate
+        $global:UseGraphEnvironment = $GraphEnvironment
+        $global:UseGCCType = $GCCType
+
+        if($global:AzureAppId)
+        {
+            Write-Host "Using Azure App Id: $($global:AzureAppId)"
+        }
+        else
+        {
+            Write-Warning "Azure App Id is missing. Use -AppId <AppID> on the command line"
+        }
+
+        if($global:ClientSecret -or $global:ClientCert)
+        {
+            if($global:ClientSecret)
+            {
+                Write-Host "Using Azure App Secret"
+            }
+            else
+            {
+                Write-Host "Using Azure App Certificate"
+            }            
+        }
+        else
+        {
+            Write-Warning "Azure App Secret or Certificate is missing. Use -Secret <Secret> or -Certificate <Certificate> on the command line"
+        }
+
+        if($global:UseGraphEnvironment)
+        {
+            Write-Host "Using Azure Graph Environment: $($global:UseGraphEnvironment)"
+        }
+
+        if($global:UseGCCType)
+        {
+            Write-Host "Using Graph Environment type: $($global:UseGCCType)"
+        }
+    }
+    elseif($secret)
+    {
+        $global:ClientSecret = $secret 
+    }
+    if($certificate)
+    {
+        $global:ClientCert = $certificate 
+    }
+
+
+    if($global:hideUI -ne $true)
+    {                
+        # Run with UI
         try 
         {
             [xml]$xaml = Get-Content ([IO.Path]::GetDirectoryName($PSCommandPath) + "\Xaml\SplashScreen.xaml")
@@ -93,17 +178,48 @@ function Initialize-CloudAPIManagement
         {
             
         }
+    }
+    else
+    {
+        # Run silent
+
+        if(-not $tenantId)
+        {
+            # Core module not loaded yet so can't use log function
+            Write-Error "Tenant Id is missing. Use -TenantId <Tenant-guid> on the command line to run silent batch jobs"
+            return
+        }
+    }
+
+    $global:TenantId = $tenantId
+
 
     if($ShowConsoleWindow -ne $true)
     {
         Hide-Console
     }
 
+    if($JSonSettings -eq $true)
+    {
+        $global:UseJSonSettings = $true
+        $global:JSonSettingFile = $JSonFile
+    }
+    else
+    {
+        $global:UseJSonSettings = $false
+    }
+
+    if($global:hideUI -ne $true)
+    {
         $global:txtSplashText.Text = "Unblock files"
+    } 
     [System.Windows.Forms.Application]::DoEvents()
     Unblock-AllFiles $PSScriptRoot
 
+    if($global:hideUI -ne $true)
+    {
         $global:txtSplashText.Text = "Load core module"
+    }
     [System.Windows.Forms.Application]::DoEvents()
     Import-Module ($PSScriptRoot + "\Core.psm1") -Force -Global
 

Documentation.md

@@ -2,7 +2,7 @@
 
 The script can document most of the profiles and policies in Intune. The output can either be CSV or Word. Documenting to Word can either be to an existing Word template or empty document. There are many options for the documentation e.g. Language, Header styles, Table styles, managing not configured items etc.  
 
-The idea behind the documentation method in the script is to output the information as close to the Endpoint Manager portal as possible.  Some of the objects has a different property name or value in the Summary text vs Edit mode in the portal. The documentation will then use the Edit mode information when possible. Some policies and profiles might have a slightly different order that the portal.
+The idea behind the documentation method in the script is to output the information as close to the Endpoint Manager portal as possible. Some of the objects has a different property name or value in the Summary text vs Edit mode in the portal. The documentation will then use the Edit mode information when possible. Some policies and profiles might have a slightly different order than the portal.
 
 The objects can be documented in three ways:
 
@@ -28,7 +28,7 @@ Please read the [Deep Dive](#deep-dive) section  below for a detailed descriptio
 
 The script can document the objects in any language supported by Intune. 
 
-Note that some profiles and properties does not have language support. These will be documented in English.
+Note that some profiles and properties do not have language support. These will be documented in English.
 
 **Known Issues**
 
@@ -36,7 +36,7 @@ This is the first version of the documentation support.
 
 * There are over 100 different object types. Not all are supported and not all supported object types are tested and verified. 
 
-* Property based profiles might be missing some properties. Some properties in the translation files are generated at runtime. Support for these properties are added in the custom documentation provider
+* Property based profiles might be missing some properties. Some properties in the translation files are generated at runtime. Support for these properties are added in the custom documentation provider.
 
 * Some complex type properties are not translated in this version e.g. the screen layout of apps on the iPhone. 
 
@@ -52,7 +52,9 @@ This is the first version of the documentation support.
 
 * Some Endpoint Security polices are NOT deviceManagementIntent objects. They are actually Settings Catalog objects and they will be listed with the Settings Catalog items e.g. *Antivirus - Windows 10 and Windows Server (ConfigMgr)* policies
 
-* Some Endpoint Security/Settings Catalog items is not translated based on Graph API in the portal e.g. *Antivirus - Windows 10 and Windows Server (ConfigMgr)* policies.  These will be documented based on Graph API information which might be different compared to the portal
+* Some Endpoint Security/Settings Catalog items are not translated based on Graph API in the portal e.g. *Antivirus - Windows 10 and Windows Server (ConfigMgr)* policies.  These will be documented based on Graph API information which might be different compared to the portal
+
+* Markdown is currently in experimental state. The script can document to an MD file created in the Documents folder but this can be to large in environments with many objects. The script will create HTML tables to support code blocks and column span. The MD View must support HTML tables to display the document. The *Markdown Viewer* extension in Chrome was used during testing.
 
 Please create an [Issue](https://github.com/Micke-K/IntuneManagement/issues) if properties are documented incorrectly or missing. 
 
@@ -64,7 +66,7 @@ The documentation is based on a two step process
 
   This will collection all the information about the object and add it to a PowerShell object in the code
 
-* Send the information to the selected output type
+* Send the information to the selected output provider
 
   This will send all the information gathered about the object to the selected output provider
 
@@ -91,7 +93,7 @@ Property based objects are very complex to document. These objects can be docume
 * PowerShell function
 * Or a combination of PowerShell and manually created json files 
 
-Json files for translating property objects to documentation is located in the Documentation\ObjectInfo folder. All files that start with a # is manually created. These can either be based on the object type (@OData.Type) or the Object Type Id (specified in the EndpointManager.psm1 file). Files that does not start with a # are automatically generated and the `ObjectCategories.json` file contains the mapping between the Intune object and associated json files. One object type can be associated with multiple files. Each file represents one category of the object.
+Json files for translating property objects to documentation is located in the Documentation\ObjectInfo folder. All files that start with a # are manually created. These can either be based on the object type (@OData.Type) or the Object Type Id (specified in the EndpointManager.psm1 file). Files that does not start with a # are automatically generated and the `ObjectCategories.json` file contains the mapping between the Intune object and associated json files. One object type can be associated with multiple files. Each file represents one category of the object.
 
 The generated files sometimes requires additional manually created properties. These could be properties in the UI that has a Yes/No, Enabled/Not Configured etc. trigger associated with a specific value. These properties must be manually added to the object before the documentation. The `DocumentationCustom.psm1` file takes care of this. This file is also used for overriding the documentation of specific values and other custom required processing.    
 
@@ -99,9 +101,78 @@ The json files contains a definition of each property to document. This includes
 
 The `DocumentationCustom.psm1` file also takes care of custom documentation for some object types e.g. Conditional Access. App Configuration policies etc. These objects are documented via a PowerShell function in the script.
 
+**dataTypes Reference**
+
+The following `dataType` values are supported in property-based ObjectInfo json files:
+
+| Value | Name | Description |
+|---|---|---|
+| `0` | Boolean | Translated via the `booleanActions` field |
+| `1` | Base64 | Certificate or binary data decoded to a UTF-8 string; filename used if `filenameEntityKey` is set |
+| `2` | Multiline String | Multiline text or XML decoded from Base64 if needed; stored to a payload file if `filenameEntityKey` is set |
+| `3` | Image | Binary image; outputs "Image file" when a value is present |
+| `4` | Linked Certificate | Certificate resolved via OData navigation link |
+| `5` | Complex Options | Iterates child `complexOptions` as a sub-section |
+| `6` | Complex Option (sub-property) | Iterates `complexOptions` resolved via `entityKey` sub-property |
+| `7` | OMA DateTime | Raw OMA DateTime string |
+| `8` | Sub-category | Sets the current sub-category label from `nameResourceKey` |
+| `9` | Label / OData Type | Skipped — UI label or `@odata.type` property |
+| `10` | Information Box | Skipped — UI-only information box |
+| `11` | App Picker | Application picker |
+| `12` | Multiline String Array | Array of strings joined with the object separator |
+| `13` | Multi Option | Multiple selection; translated via `Invoke-TranslateMultiOption` |
+| `14` | Int32 | 32-bit integer |
+| `15` | Int64 | 64-bit integer |
+| `16` | Option | Single-select option; translated via `Invoke-TranslateOption` |
+| `19` | Option (variant) | Single-select option; translated via `Invoke-TranslateOption` |
+| `20` | String | Plain string |
+| `21` | Table | Sub-table; translated via `Invoke-TranslateTable` |
+| `22` | Scale Value | Numeric value combined with a unit from `scaleOptions` (e.g. "4 Years") |
+| `99` | Reserved | No-op placeholder |
+| `100` | Duration | Custom `Edm.Duration` formatting via `Invoke-TranslateDuration` |
+| `101` | Static Label | Language string taken from the `value` field |
+| `102` | Culture Name | Language/culture name string |
+| `103` | Boolean (hide on false) | Boolean via `booleanActions`; hides child properties when `false` |
+| `104` | Multi Option Boolean | Multi-option via boolean; hides children when `false` |
+| `105` | Multi Option Boolean (inverted) | Like `104` but treats `false` as the selected state |
+| `106` | Language Array | Array of culture/language names joined with the object separator |
+| `107` | Static Value | Literal string taken directly from the `value` field |
+| `108` | String with Format | String formatted using the `formatStringKey` language template |
+| `200` | Multi Option (language key) | Translated string looked up via `entityKey` as a language string ID |
+
+**booleanActions Reference**
+
+The `booleanActions` field controls the text shown for `true`/`false` values when `dataType` is `0`, `103`, `104`, or `105`.
+
+Values `0`–`9` and `107`–`108` only display a custom label when `true`; a `false` value falls through to *Not Configured*.
+
+| Value | `true` → | `false` → |
+|---|---|---|
+| `0` | Allow | *(Not Configured)* |
+| `1` | Require | *(Not Configured)* |
+| `2` | Enable | *(Not Configured)* |
+| `3` | Block | *(Not Configured)* |
+| `4` | Configured | *(Not Configured)* |
+| `5` | Disable | *(Not Configured)* |
+| `6` | Limit | *(Not Configured)* |
+| `7` | Show | *(Not Configured)* |
+| `8` | Hide | *(Not Configured)* |
+| `9` | Yes | *(Not Configured)* |
+| `100` | Block | Allow |
+| `101` | Require | Not Required |
+| `102` | Enable | Disable |
+| `107` | Show | *(Not Configured)* |
+| `108` | Hide | *(Not Configured)* |
+| `109` | Yes | No |
+| `110` | No | Yes |
+| `120` | On | Off |
+| `200` | Allow | Block |
+| `201` | Not Required | Require |
+| `220` | Off | On |
+
 **Language Support**
 
-The Settings based objects get their language strings from Graph APIs with a few exemptions.
+The Settings based objects get their language strings from Graph APIs with a few exceptions.
 
 The property based objects uses static language files. Each language file is generated based on multiple language files. Not all the language information is included in these files to reduce the output size. This could reduce the possibility to create custom documentation with multi language support.
 
@@ -109,7 +180,7 @@ These files will have to be re-generated when new functionality is released in I
 
 **Scripts for Generated Files**
 
-The scripts that automatically generates language files, translation files, object info etc. are not included in the release. These scripts are currently not in a state that they can be released. The best would be if Microsoft released all the required information in Graph. A deep dive into graph suggests that it might be possible in the future since some information about the generated files are there but with some properties missing or language text missing. The information can't be accessed unless an API is called that gets the definition for all the profiles at the same time (the file is over 100MB). 
+The scripts that automatically generate language files, translation files, object info etc. are not included in the release. These scripts are currently not in a state that they can be released. The best would be if Microsoft released all the required information in Graph. A deep dive into graph suggests that it might be possible in the future since some information about the generated files are there but with some properties missing or language text missing. The information can't be accessed unless an API is called that gets the definition for all the profiles at the same time (the file is over 100MB). 
 
 ## Extending The Documentation
 
@@ -130,9 +201,9 @@ 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 PowerShell functions.
 
-Documentation providers has a Priority property. This defines in what order the providers will be triggered. The provider with the lowest priority number will be executed first. The included custom documentation provider has a priority number of 1000. The information gathering of the provider can be overridden by creating a custom documentation provider with a lower priority number.
+Documentation providers have a Priority property. This defines in what order the providers will be triggered. The provider with the lowest priority number will be executed first. The included custom documentation provider has a priority number of 1000. The information gathering of the provider can be overridden by creating a custom documentation provider with a lower priority number.
 
 **Documentation Output Provider**
 

Documentation/CategoryId.json

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

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

@@ -1,4 +1,4 @@
-[
+[
     {
         "ObjectType":  "#microsoft.graph.androidCustomConfiguration",
         "PolicyType":  "AndroidCustom",
@@ -114,7 +114,8 @@
                            "AndroidDeviceOwnerApplications",
                            "VPNConnectivity",
                            "WorkProfilePassword",
-                           "PersonalProfile"
+                           "PersonalProfile",
+                           "AndroidDeviceOwnerPolicyMessages"
                        ],
         "ShowDisabled":  true
     },
@@ -313,6 +314,15 @@
 
                        ]
     },
+    {
+        "ObjectType":  "#microsoft.graph.androidWorkProfileMigrationConfiguration",
+        "PolicyType":  "AndroidForWorkMigrationPolicy",
+        "PolicyTypeLanguageId":  "androidForWorkMigrationPolicy",
+        "PlatformLanguageId":  "AndroidForWork",
+        "Categories":  [
+
+                       ]
+    },
     {
         "ObjectType":  "#microsoft.graph.androidForWorkVpnConfiguration",
         "PolicyType":  "AndroidForWorkVpn",
@@ -413,6 +423,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",
@@ -424,7 +479,7 @@
                        ]
     },
     {
-        "ObjectType":  "#microsoft.graph.hardwareConfiguration",
+        "ObjectType":  "#microsoft.graph.hardwareConfigurations",
         "PolicyType":  "HardwareConfigurations",
         "PolicyTypeLanguageId":  "hardwareConfigurations",
         "PlatformLanguageId":  "Windows10",
@@ -579,6 +634,15 @@
 
                        ]
     },
+    {
+        "ObjectType":  "#microsoft.graph.iosWiredNetworkConfiguration",
+        "PolicyType":  "IosWiredNetwork",
+        "PolicyTypeLanguageId":  "wiredNetwork",
+        "PlatformLanguageId":  "Ios",
+        "Categories":  [
+
+                       ]
+    },
     {
         "ObjectType":  "#microsoft.graph.iosEnterpriseWiFiConfiguration",
         "PolicyType":  "IosWiFi",
@@ -799,7 +863,14 @@
         "PolicyTypeLanguageId":  "deviceFirmwareConfigurationInterface",
         "PlatformLanguageId":  "Windows10",
         "Categories":  [
-                           "DeviceFirmwareConfigurationInterface"
+                           "UEFIAccess",
+                           "DFCISecuritySettings",
+                           "Cameras",
+                           "MicrophonesAndSpeakers",
+                           "Radios",
+                           "BootOptions",
+                           "Ports",
+                           "WakeSettings"
                        ]
     },
     {
@@ -961,13 +1032,7 @@
         "PolicyTypeLanguageId":  "vpn",
         "PlatformLanguageId":  "Windows10",
         "Categories":  [
-                           "vpn",
-                           "vpnappsandtrafficrules",
-                           "vpnconditionalaccess",
-                           "vpndnstriggers",
-                           "vpnproxy",
-                           "vpnsplittunneling",
-                           "vpntrustednetwork"
+                           "vpn"
                        ]
     },
     {
@@ -1114,6 +1179,15 @@
                            "Win10Wifi"
                        ]
     },
+    {
+        "ObjectType":  "#microsoft.graph.windowsWiredNetworkConfiguration",
+        "PolicyType":  "Windows10WiredNetwork",
+        "PolicyTypeLanguageId":  "wiredNetwork",
+        "PlatformLanguageId":  "Windows10",
+        "Categories":  [
+
+                       ]
+    },
     {
         "ObjectType":  "#microsoft.graph.windowsWifiEnterpriseEAPConfiguration",
         "PolicyType":  "Windows10WiFi",
@@ -1141,6 +1215,15 @@
                            "HealthMonitoring"
                        ]
     },
+    {
+        "ObjectType":  "#microsoft.graph.windowsZtdnsConfiguration",
+        "PolicyType":  "Windows10Ztdns",
+        "PolicyTypeLanguageId":  "windowsZeroTrustDns",
+        "PlatformLanguageId":  "Windows10",
+        "Categories":  [
+
+                       ]
+    },
     {
         "ObjectType":  "#microsoft.graph.windows10XWifiConfiguration",
         "PolicyType":  "Windows10XWifi",
@@ -1320,5 +1403,32 @@
         "Categories":  [
 
                        ]
+    },
+    {
+        "ObjectType":  "settingsCatalogLinux",
+        "PolicyType":  "SettingsCatalogLinux",
+        "PolicyTypeLanguageId":  "settingsCatalog",
+        "PlatformLanguageId":  "Linux",
+        "Categories":  [
+
+                       ]
+    },
+    {
+        "ObjectType":  "settingsCatalogIOS",
+        "PolicyType":  "SettingsCatalogIOS",
+        "PolicyTypeLanguageId":  "settingsCatalog",
+        "PlatformLanguageId":  "Ios",
+        "Categories":  [
+
+                       ]
+    },
+    {
+        "ObjectType":  "#microsoft.graph.inventoryCatalog",
+        "PolicyType":  "InventoryCatalog",
+        "PolicyTypeLanguageId":  null,
+        "PlatformLanguageId":  null,
+        "Categories":  [
+
+                       ]
     }
 ]

Documentation/ObjectInfo/#AppConfigOutlookDevice.json

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

Documentation/ObjectInfo/#Applications.json

@@ -7,6 +7,96 @@
         "booleanActions":  0,
         "category": "AppInformationTab.name"
     },
+    {
+        "nameResourceKey":  "Inputs.packageIdLabel",
+        "descriptionResourceKey":  "",
+        "entityKey":  "packageIdentifier",
+        "dataType":  20,
+        "booleanActions":  0,
+        "category": "AppInformationTab.name",
+        "Condition": {                            
+            "Expressions": [
+                {
+                    "property": "@OData.Type",
+                    "value": "#microsoft.graph.winGetApp"
+                }                        
+            ]
+        } 
+    },
+    {
+        "nameResourceKey":  "Inputs.packageIdLabel",
+        "descriptionResourceKey":  "",
+        "entityKey":  "packageIdentifier",
+        "dataType":  107,
+        "booleanActions":  0,
+        "category": "AppInformationTab.name",
+        "value": "UWP",
+        "Condition": {
+            "type": "and",
+            "Expressions": [
+                {
+                    "property": "packageIdentifier",
+                    "value": "9*",
+                    "operator": "like"
+                },
+                {
+                    "property": "@OData.Type",
+                    "value": "#microsoft.graph.winGetApp"
+                }
+            ]
+        }
+    },
+    {
+        "nameResourceKey":  "Inputs.packageIdLabel",
+        "descriptionResourceKey":  "",
+        "entityKey":  "packageIdentifier",
+        "dataType":  107,
+        "booleanActions":  0,
+        "category": "AppInformationTab.name",
+        "value": "Win32",
+        "Condition": {
+            "type": "and",
+            "Expressions": [
+                {
+                    "property": "packageIdentifier",
+                    "value": "X*",
+                    "operator": "like"
+                },
+                {
+                    "property": "@OData.Type",
+                    "value": "#microsoft.graph.winGetApp"
+                }
+            ]
+        }
+    },
+    {
+        "nameResourceKey":  "Inputs.packageIdLabel",
+        "descriptionResourceKey":  "",
+        "entityKey":  "packageIdentifier",
+        "dataType":  107,
+        "booleanActions":  0,
+        "category": "AppInformationTab.name",
+        "value": "Unsupported Store Type",
+        "Condition": {
+            "type": "and",
+            "Expressions": [
+                {
+                    "property": "packageIdentifier",
+                    "value": "9*",
+                    "operator": "notlike"
+                },
+                {
+                    "property": "packageIdentifier",
+                    "value": "X*",
+                    "operator": "notlike"
+                },
+                {
+                    "property": "@OData.Type",
+                    "value": "#microsoft.graph.winGetApp"
+                }
+            ]
+        }
+    },    
     {
         "nameResourceKey":  "Inputs.displayVersionLabel",
         "descriptionResourceKey":  "",
@@ -765,22 +855,124 @@
             ]
         },
         "complexOptions": [
+            {
+                "nameResourceKey":  "Win32Program.installerTypeText",
+                "descriptionResourceKey":  "",
+                "entityKey":  "installerType",
+                "dataType":  20,
+                "booleanActions":  0,
+                "category": "Win32Program.selectorLabel",
+                "Children": [
                     {
                         "nameResourceKey":  "Win32Program.installCommand",
                         "descriptionResourceKey":  "",
                         "entityKey":  "installCommandLine",
                         "dataType":  20,
                         "booleanActions":  0,
+                        "category": "Win32Program.selectorLabel",
+                        "Condition": {
+                            "Expressions": [
+                                {
+                                    "property": "installCommandLine"
+                                }
+                            ]
+                        }
+                    },
+                    {
+                        "nameResourceKey":  "Win32Program.installScript",
+                        "descriptionResourceKey":  "",
+                        "entityKey":  "activeInstallScript",
+                        "dataType":  6,
+                        "booleanActions":  0,
+                        "category": "Win32Program.selectorLabel",
+                        "complexOptions": [
+                            {
+                                "nameResourceKey":  "TableHeaders.scriptName",
+                                "descriptionResourceKey":  "",
+                                "entityKey":  "scriptName",
+                                "dataType":  20,
+                                "booleanActions":  0,
                                 "category": "Win32Program.selectorLabel"
                             },
+                            {
+                                "nameResourceKey":  "Win32Requirements.AdditionalRequirements.Script.enforceSignatureCheck",
+                                "descriptionResourceKey":  "Win32Requirements.AdditionalRequirements.Script.enforceSignatureCheckTooltip",
+                                "entityKey":  "enforceSignatureCheck",
+                                "dataType":  0,
+                                "booleanActions":  109,
+                                "category": "Win32Program.selectorLabel"
+                            },
+                            {
+                                "nameResourceKey": "DetectionRules.CustomScript.runAs32Bit",
+                                "descriptionResourceKey": "DetectionRules.CustomScript.runAs32BitTooltip",
+                                "entityKey":  "runAs32Bit",
+                                "dataType":  0,
+                                "booleanActions":  109,
+                                "category": "Win32Program.selectorLabel"
+                            }
+                        ]
+                    }
+                ]
+            },            
+            {
+                "nameResourceKey":  "Win32Program.uninstallerTypeText",
+                "descriptionResourceKey":  "",
+                "entityKey":  "uninstallerType",
+                "dataType":  20,
+                "booleanActions":  0,
+                "category": "Win32Program.selectorLabel",
+                "Children": [
                     {
                         "nameResourceKey":  "Win32Program.uninstallCommand",
                         "descriptionResourceKey":  "",
                         "entityKey":  "uninstallCommandLine",
                         "dataType":  20,
                         "booleanActions":  0,
+                        "category": "Win32Program.selectorLabel",
+                        "Condition": {
+                            "Expressions": [
+                                {
+                                    "property": "uninstallCommandLine"
+                                }
+                            ]
+                        }
+                    },
+                    {
+                        "nameResourceKey":  "Win32Program.uninstallScript",
+                        "descriptionResourceKey":  "",
+                        "entityKey":  "activeUninstallScript",
+                        "dataType":  6,
+                        "booleanActions":  0,
+                        "category": "Win32Program.selectorLabel",
+                        "complexOptions": [
+                            {
+                                "nameResourceKey":  "TableHeaders.scriptName",
+                                "descriptionResourceKey":  "",
+                                "entityKey":  "scriptName",
+                                "dataType":  20,
+                                "booleanActions":  0,
                                 "category": "Win32Program.selectorLabel"
                             },
+                            {
+                                "nameResourceKey":  "Win32Requirements.AdditionalRequirements.Script.enforceSignatureCheck",
+                                "descriptionResourceKey":  "Win32Requirements.AdditionalRequirements.Script.enforceSignatureCheckTooltip",
+                                "entityKey":  "enforceSignatureCheck",
+                                "dataType":  0,
+                                "booleanActions":  109,
+                                "category": "Win32Program.selectorLabel"
+                            },
+                            {
+                                "nameResourceKey":  "DetectionRules.CustomScript.runAs32Bit",
+                                "descriptionResourceKey":  "DetectionRules.CustomScript.runAs32BitTooltip",
+                                "entityKey":  "runAs32Bit",
+                                "dataType":  0,
+                                "booleanActions":  109,
+                                "category": "Win32Program.selectorLabel"
+                            }
+                        ]
+                    }
+                ]
+            },
             {
                 "nameResourceKey":  "",
                 "descriptionResourceKey":  "",
@@ -836,10 +1028,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 +1098,24 @@
                 "category": "Win32Requirements.selectorLabel"
             },
             {
+                "Columns": [
+                    {
+                        "metadata": {
+                            "entityKey": "property",
+                            "nameResourceKey": "ApplicabilityRules.GridLabel.property"
+                        }
+                    },
+                    {
+                        "metadata": {
+                            "entityKey": "value",
+                            "nameResourceKey": "ApplicabilityRules.GridLabel.value"
+                        }
+                    }
+                ],
                 "nameResourceKey":  "Win32Requirements.AdditionalRequirements.label",
                 "descriptionResourceKey":  "",
-                "entityKey":  "requirementRulesSummary",
-                "dataType":  20,
+                "entityKey":  "requirementRulesTranslated",
+                "dataType":  21,
                 "booleanActions":  0,
                 "category": "Win32Requirements.selectorLabel"
             },
@@ -908,10 +1128,24 @@
                 "category": "DetectionRules.selectorLabel"
             },
             {
+                "Columns": [
+                    {
+                        "metadata": {
+                            "entityKey": "property",
+                            "nameResourceKey": "ApplicabilityRules.GridLabel.property"
+                        }
+                    },
+                    {
+                        "metadata": {
+                            "entityKey": "value",
+                            "nameResourceKey": "ApplicabilityRules.GridLabel.value"
+                        }
+                    }
+                ],
                 "nameResourceKey":  "DetectionRules.selectorLabel",
                 "descriptionResourceKey":  "",
-                "entityKey":  "detectionRulesSummary",
-                "dataType":  20,
+                "entityKey":  "detectionRulesTranslated",
+                "dataType":  21,
                 "booleanActions":  0,
                 "category": "DetectionRules.selectorLabel",
                 "Condition": {                            
@@ -967,12 +1201,12 @@
                 "category": "SettingDetails.dependencyCategory"
             },
             {
-                "nameResourceKey":  "supersedenceCategory",
+                "nameResourceKey":  "AppRelationshipStatus.Tabs.supersedence",
                 "descriptionResourceKey":  "",
                 "entityKey":  "supersededApps",
                 "dataType":  20,
                 "booleanActions":  0,
-                "category": "SettingDetails.supersedenceCategory"
+                "category": "AppRelationshipStatus.Tabs.supersedence"
             }
         ]
     }    

Documentation/ObjectInfo/#AutoPilot.json

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

@@ -14,5 +14,94 @@
         "dataType":  20,
         "booleanActions":  0,
         "category":  "WindowsFeatureUpdateProfile.Details.deploymentSettingsTitle"
+    },
+    {
+        "nameResourceKey":  "WindowsFeatureUpdateProfile.Details.OptionalUpdate.label",
+        "descriptionResourceKey":  "",
+        "entityKey":  "installFeatureUpdatesOptional",
+        "dataType":  16,
+        "booleanActions":  0,
+        "category": "WindowsFeatureUpdateProfile.Details.deploymentSettingsTitle",
+        "options":  [
+            {
+                "nameResourceKey":  "OptionalFeatureUpdateOptions.required",
+                "descriptionResourceKey":  "",
+                "value":  false
+            },
+            {
+                "nameResourceKey":  "OptionalFeatureUpdateOptions.optional",
+                "descriptionResourceKey":  "",
+                "value":  true
+            }
+        ]
+    },
+    {
+        "nameResourceKey":  "WindowsFeatureUpdateProfile.Details.Windows11SideBySideInstall.label",
+        "descriptionResourceKey":  "",
+        "entityKey":  "installLatestWindows10OnWindows11IneligibleDevice",
+        "dataType":  0,
+        "booleanActions":  109,
+        "category": "WindowsFeatureUpdateProfile.Details.deploymentSettingsTitle"
+    },
+    {
+        "nameResourceKey":  "WindowsFeatureUpdateProfile.Details.RolloutOptions.label",
+        "descriptionResourceKey":  "",
+        "entityKey":  "featureUpdateRolloutOption",
+        "dataType":  16,
+        "booleanActions":  0,
+        "category": "WindowsFeatureUpdateProfile.Details.deploymentSettingsTitle",
+        "options":  [
+            {
+                "nameResourceKey":  "WindowsUpdateRolloutOptions.immediateStart",
+                "descriptionResourceKey":  "",
+                "value":  "immediateStart"
+            },
+            {
+                "nameResourceKey":  "WindowsUpdateRolloutOptions.gradualRollout",
+                "descriptionResourceKey":  "",
+                "value":  "gradualRollout",
+                "ChildSettings": [
+                    {
+                        "nameResourceKey":  "WindowsFeatureUpdateProfile.Details.GradualRolloutStartDate.label",
+                        "descriptionResourceKey":  "",
+                        "dataType":  20,
+                        "category":  "WindowsFeatureUpdateProfile.Details.deploymentSettingsTitle",
+                        "entityKey":  "featureUpdateRolloutStartDate",
+                        "booleanActions":  0
+                    },
+                    {
+                        "nameResourceKey":  "WindowsFeatureUpdateProfile.Details.GradualRolloutEndDate.label",
+                        "descriptionResourceKey":  "",
+                        "dataType":  20,
+                        "category":  "WindowsFeatureUpdateProfile.Details.deploymentSettingsTitle",
+                        "entityKey":  "featureUpdateRolloutEndDate",
+                        "booleanActions":  0
+                    },
+                    {
+                        "nameResourceKey":  "WindowsFeatureUpdateProfile.Details.GradualRolloutInterval.label",
+                        "descriptionResourceKey":  "",
+                        "dataType":  20,
+                        "category":  "WindowsFeatureUpdateProfile.Details.deploymentSettingsTitle",
+                        "entityKey":  "featureUpdateRolloutInterval",
+                        "booleanActions":  0
+                    }                                        
+                ]                
+            },
+            {
+                "nameResourceKey":  "WindowsUpdateRolloutOptions.startDateOnly",
+                "descriptionResourceKey":  "",
+                "value":  "startDateOnly",
+                "ChildSettings": [
+                    {
+                        "nameResourceKey":  "WindowsFeatureUpdateProfile.Details.GradualRolloutStartDate.label",
+                        "descriptionResourceKey":  "",
+                        "dataType":  20,
+                        "category":  "WindowsFeatureUpdateProfile.Details.deploymentSettingsTitle",
+                        "entityKey":  "featureUpdateRolloutStartDate",
+                        "booleanActions":  0
+                    }
+                ]
+            }
+        ]
     }    
 ]

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

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

Documentation/ObjectInfo/airprint_iosdevicefeatures.json

@@ -1,4 +1,4 @@
-{
+{
     "airprint_iosdevicefeatures":  [
                                        {
                                            "isSettingDescription":  false,

Documentation/ObjectInfo/airprint_macdevicefeatures.json

@@ -1,4 +1,4 @@
-{
+{
     "airprint_macdevicefeatures":  [
                                        {
                                            "isSettingDescription":  false,

Documentation/ObjectInfo/androiddefenderatp_complianceandroid.json

@@ -1,14 +1,14 @@
-{
+{
     "androiddefenderatp_complianceandroid":  {
                                                  "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

@@ -1,14 +1,14 @@
-{
+{
     "androiddefenderatp_complianceandroiddeviceowner":  {
                                                             "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

@@ -1,14 +1,14 @@
-{
+{
     "androiddefenderatp_complianceandroidforwork":  {
                                                         "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

@@ -1,4 +1,4 @@
-{
+{
     "androiddeviceownerapplications_androiddeviceownergeneral":  [
                                                                      {
                                                                          "isSettingDescription":  false,
@@ -85,7 +85,7 @@
                                                                                                    "enabled":  true
                                                                                                },
                                                                                                {
-                                                                                                   "dataType":  0,
+                                                                                                   "dataType":  16,
                                                                                                    "category":  2,
                                                                                                    "nameResourceKey":  "publicPlayStoreEnabledName",
                                                                                                    "descriptionResourceKey":  "publicPlayStoreEnabledDescription",
@@ -93,13 +93,200 @@
 
                                                                                                                      ],
                                                                                                    "options":  [
-
+                                                                                                                   {
+                                                                                                                       "nameResourceKey":  "publicPlayStoreSelectionNotConfigured",
+                                                                                                                       "value":  "notConfigured",
+                                                                                                                       "enabled":  true
+                                                                                                                   },
+                                                                                                                   {
+                                                                                                                       "nameResourceKey":  "publicPlayStoreSelectionAllowList",
+                                                                                                                       "value":  "allowList",
+                                                                                                                       "enabled":  true
+                                                                                                                   },
+                                                                                                                   {
+                                                                                                                       "nameResourceKey":  "publicPlayStoreSelectionBlockList",
+                                                                                                                       "value":  "blockList",
+                                                                                                                       "enabled":  true
+                                                                                                                   }
                                                                                                                ],
-                                                                                                   "entityKey":  "publicPlayStoreEnabled",
+                                                                                                   "entityKey":  "playStoreMode",
                                                                                                    "booleanActions":  0,
-                                                                                                   "defaultValue":  false,
+                                                                                                   "defaultValue":  "notConfigured",
+                                                                                                   "unconfiguredValue":  "notConfigured",
                                                                                                    "policyType":  2,
                                                                                                    "enabled":  true
+                                                                                               },
+                                                                                               {
+                                                                                                   "dataType":  10,
+                                                                                                   "category":  2,
+                                                                                                   "nameResourceKey":  "publicPlayStoreEnabledWarning",
+                                                                                                   "childSettings":  [
+
+                                                                                                                     ],
+                                                                                                   "options":  [
+
+                                                                                                               ],
+                                                                                                   "booleanActions":  0,
+                                                                                                   "policyType":  2,
+                                                                                                   "enabled":  true
+                                                                                               },
+                                                                                               {
+                                                                                                   "columns":  [
+                                                                                                                   {
+                                                                                                                       "metadata":  {
+                                                                                                                                        "dataType":  20,
+                                                                                                                                        "category":  2,
+                                                                                                                                        "nameResourceKey":  "appNameName",
+                                                                                                                                        "descriptionResourceKey":  "Empty",
+                                                                                                                                        "childSettings":  [
+
+                                                                                                                                                          ],
+                                                                                                                                        "options":  [
+
+                                                                                                                                                    ],
+                                                                                                                                        "entityKey":  "name",
+                                                                                                                                        "booleanActions":  0,
+                                                                                                                                        "policyType":  2,
+                                                                                                                                        "enabled":  false
+                                                                                                                                    }
+                                                                                                                   },
+                                                                                                                   {
+                                                                                                                       "metadata":  {
+                                                                                                                                        "dataType":  20,
+                                                                                                                                        "category":  2,
+                                                                                                                                        "nameResourceKey":  "packageName",
+                                                                                                                                        "descriptionResourceKey":  "Empty",
+                                                                                                                                        "childSettings":  [
+
+                                                                                                                                                          ],
+                                                                                                                                        "options":  [
+
+                                                                                                                                                    ],
+                                                                                                                                        "entityKey":  "appId",
+                                                                                                                                        "booleanActions":  0,
+                                                                                                                                        "policyType":  2,
+                                                                                                                                        "enabled":  false
+                                                                                                                                    }
+                                                                                                                   },
+                                                                                                                   {
+                                                                                                                       "metadata":  {
+                                                                                                                                        "dataType":  20,
+                                                                                                                                        "category":  2,
+                                                                                                                                        "nameResourceKey":  "appUrlName",
+                                                                                                                                        "descriptionResourceKey":  "Empty",
+                                                                                                                                        "childSettings":  [
+
+                                                                                                                                                          ],
+                                                                                                                                        "options":  [
+
+                                                                                                                                                    ],
+                                                                                                                                        "entityKey":  "appStoreUrl",
+                                                                                                                                        "booleanActions":  0,
+                                                                                                                                        "policyType":  2,
+                                                                                                                                        "enabled":  false
+                                                                                                                                    }
+                                                                                                                   },
+                                                                                                                   {
+                                                                                                                       "metadata":  {
+                                                                                                                                        "dataType":  20,
+                                                                                                                                        "category":  2,
+                                                                                                                                        "nameResourceKey":  "appPublisherName",
+                                                                                                                                        "descriptionResourceKey":  "Empty",
+                                                                                                                                        "childSettings":  [
+
+                                                                                                                                                          ],
+                                                                                                                                        "options":  [
+
+                                                                                                                                                    ],
+                                                                                                                                        "entityKey":  "publisher",
+                                                                                                                                        "booleanActions":  0,
+                                                                                                                                        "policyType":  2,
+                                                                                                                                        "enabled":  false
+                                                                                                                                    }
+                                                                                                                   }
+                                                                                                               ],
+                                                                                                   "dataType":  21,
+                                                                                                   "category":  2,
+                                                                                                   "nameResourceKey":  "certificateInstallTitle",
+                                                                                                   "descriptionResourceKey":  "certificateInstallDescription",
+                                                                                                   "childSettings":  [
+
+                                                                                                                     ],
+                                                                                                   "options":  [
+
+                                                                                                               ],
+                                                                                                   "entityKey":  "certInstallApps",
+                                                                                                   "booleanActions":  0,
+                                                                                                   "policyType":  2,
+                                                                                                   "enabled":  false
+                                                                                               },
+                                                                                               {
+                                                                                                   "complexOptions":  [
+                                                                                                                          {
+                                                                                                                              "dataType":  11,
+                                                                                                                              "category":  2,
+                                                                                                                              "nameResourceKey":  "selectSecurityApp",
+                                                                                                                              "descriptionResourceKey":  "empty",
+                                                                                                                              "childSettings":  [
+
+                                                                                                                                                ],
+                                                                                                                              "options":  [
+
+                                                                                                                                          ],
+                                                                                                                              "entityKey":  "securityLogAppId",
+                                                                                                                              "booleanActions":  0,
+                                                                                                                              "policyType":  2,
+                                                                                                                              "enabled":  true
+                                                                                                                          }
+                                                                                                                      ],
+                                                                                                   "dataType":  5,
+                                                                                                   "category":  2,
+                                                                                                   "nameResourceKey":  "securityLogsTitle",
+                                                                                                   "emptyValueResourceKey":  "selectSecurityApp",
+                                                                                                   "childSettings":  [
+
+                                                                                                                     ],
+                                                                                                   "options":  [
+
+                                                                                                               ],
+                                                                                                   "entityKey":  "securityLogApp",
+                                                                                                   "booleanActions":  0,
+                                                                                                   "policyType":  2,
+                                                                                                   "enabled":  false
+                                                                                               },
+                                                                                               {
+                                                                                                   "complexOptions":  [
+                                                                                                                          {
+                                                                                                                              "dataType":  11,
+                                                                                                                              "category":  2,
+                                                                                                                              "nameResourceKey":  "selectNetworkApp",
+                                                                                                                              "descriptionResourceKey":  "empty",
+                                                                                                                              "childSettings":  [
+
+                                                                                                                                                ],
+                                                                                                                              "options":  [
+
+                                                                                                                                          ],
+                                                                                                                              "entityKey":  "networkLogAppId",
+                                                                                                                              "booleanActions":  0,
+                                                                                                                              "policyType":  2,
+                                                                                                                              "enabled":  true
+                                                                                                                          }
+                                                                                                                      ],
+                                                                                                   "dataType":  5,
+                                                                                                   "category":  2,
+                                                                                                   "nameResourceKey":  "networkLogsTitle",
+                                                                                                   "emptyValueResourceKey":  "selectNetworkApp",
+                                                                                                   "childSettings":  [
+
+                                                                                                                     ],
+                                                                                                   "options":  [
+
+                                                                                                               ],
+                                                                                                   "entityKey":  "networkLogApp",
+                                                                                                   "booleanActions":  0,
+                                                                                                   "policyType":  2,
+                                                                                                   "enabled":  false
                                                                                                }
                                                                                            ],
                                                                          "options":  [

Documentation/ObjectInfo/androiddeviceownerpolicymessages_androiddeviceownergeneral.json

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

Documentation/ObjectInfo/applicationguard_windows10endpointprotection.json

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

@@ -1,10 +1,10 @@
-{
+{
     "applicationrestrictions_iosgeneral":  [
                                                {
                                                    "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

@@ -1,15 +1,15 @@
-{
+{
     "applicationrestrictions_macgeneral":  {
                                                "isSettingDescription":  false,
                                                "showAsSectionHeader":  true,
                                                "dataType":  8,
-                                               "category":  4,
+                                               "category":  5,
                                                "nameResourceKey":  "allEnrollmentTypesHeaderNameMac",
                                                "descriptionResourceKey":  "allEnrollmentTypesHeaderDescriptionMac",
                                                "childSettings":  [
                                                                      {
                                                                          "dataType":  16,
-                                                                         "category":  4,
+                                                                         "category":  5,
                                                                          "nameResourceKey":  "restrictedAppsListOptionsName",
                                                                          "descriptionResourceKey":  "restrictedAppsListOptionsDescription",
                                                                          "childSettings":  [
@@ -18,7 +18,7 @@
                                                                                                                    {
                                                                                                                        "metadata":  {
                                                                                                                                         "dataType":  20,
-                                                                                                                                        "category":  4,
+                                                                                                                                        "category":  5,
                                                                                                                                         "nameResourceKey":  "appBundleIdColumn",
                                                                                                                                         "descriptionResourceKey":  "empty",
                                                                                                                                         "emptyValueResourceKey":  "bundleIdExample",
@@ -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

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

@@ -1,21 +1,21 @@
-{
+{
     "applicationsandgames_iosgeneral":  [
                                             {
                                                 "isSettingDescription":  false,
                                                 "showAsSectionHeader":  true,
                                                 "dataType":  8,
-                                                "category":  7,
+                                                "category":  8,
                                                 "nameResourceKey":  "allEnrollmentTypesHeaderName",
                                                 "descriptionResourceKey":  "allEnrollmentTypesHeaderDescription",
                                                 "childSettings":  [
                                                                       {
                                                                           "dataType":  0,
-                                                                          "category":  7,
+                                                                          "category":  8,
                                                                           "nameResourceKey":  "blockManagedDocumentsInUnmanagedAppsName",
                                                                           "childSettings":  [
                                                                                                 {
                                                                                                     "dataType":  0,
-                                                                                                    "category":  7,
+                                                                                                    "category":  8,
                                                                                                     "nameResourceKey":  "allowUnmanagedToReadManagedContactsName",
                                                                                                     "descriptionResourceKey":  "allowUnmanagedToReadManagedContactsDescription",
                                                                                                     "childSettings":  [
@@ -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

@@ -1,15 +1,15 @@
-{
+{
     "applicationsandgames_macgeneral":  {
                                             "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

@@ -1,10 +1,10 @@
-{
+{
     "applicationvisibility_iosgeneral":  [
                                              {
                                                  "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

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

Documentation/ObjectInfo/appsandexperience_windows10teamgeneral.json

@@ -1,8 +1,8 @@
-{
+{
     "appsandexperience_windows10teamgeneral":  [
                                                    {
                                                        "dataType":  0,
-                                                       "category":  10,
+                                                       "category":  11,
                                                        "nameResourceKey":  "wakeScreenWhenSomeoneInRoomName",
                                                        "descriptionResourceKey":  "empty",
                                                        "childSettings":  [
@@ -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

@@ -1,10 +1,10 @@
-{
+{
     "associateddomains_macdevicefeatures":  [
                                                 {
                                                     "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

@@ -1,10 +1,10 @@
-{
+{
     "autonomoussingleappmode_iosgeneral":  [
                                                {
                                                    "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

@@ -1,10 +1,10 @@
-{
+{
     "bitlocker_windows10endpointprotection":  [
                                                   {
                                                       "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

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

@@ -1,21 +1,21 @@
-{
+{
     "builtinapps_iosgeneral":  [
                                    {
                                        "isSettingDescription":  false,
                                        "showAsSectionHeader":  true,
                                        "dataType":  8,
-                                       "category":  16,
+                                       "category":  18,
                                        "nameResourceKey":  "allEnrollmentTypesHeaderName",
                                        "descriptionResourceKey":  "allEnrollmentTypesHeaderDescription",
                                        "childSettings":  [
                                                              {
                                                                  "dataType":  0,
-                                                                 "category":  16,
+                                                                 "category":  18,
                                                                  "nameResourceKey":  "blockSiriName",
                                                                  "childSettings":  [
                                                                                        {
                                                                                            "dataType":  0,
-                                                                                           "category":  16,
+                                                                                           "category":  18,
                                                                                            "nameResourceKey":  "blockSiriWhenLockedName",
                                                                                            "childSettings":  [
 
@@ -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

@@ -1,15 +1,15 @@
-{
+{
     "builtinapps_macgeneral":  {
                                    "isSettingDescription":  false,
                                    "showAsSectionHeader":  true,
                                    "dataType":  8,
-                                   "category":  16,
+                                   "category":  18,
                                    "nameResourceKey":  "allEnrollmentTypesHeaderNameMac",
                                    "descriptionResourceKey":  "allEnrollmentTypesHeaderDescriptionMac",
                                    "childSettings":  [
                                                          {
                                                              "dataType":  0,
-                                                             "category":  16,
+                                                             "category":  18,
                                                              "nameResourceKey":  "blockSafariAutofillName",
                                                              "descriptionResourceKey":  "blockSafariAutofillDescription",
                                                              "childSettings":  [
@@ -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

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

Documentation/ObjectInfo/cloudandstorage_iosgeneral.json

@@ -1,16 +1,16 @@
-{
+{
     "cloudandstorage_iosgeneral":  [
                                        {
                                            "isSettingDescription":  false,
                                            "showAsSectionHeader":  true,
                                            "dataType":  8,
-                                           "category":  18,
+                                           "category":  21,
                                            "nameResourceKey":  "allEnrollmentTypesHeaderName",
                                            "descriptionResourceKey":  "allEnrollmentTypesHeaderDescription",
                                            "childSettings":  [
                                                                  {
                                                                      "dataType":  0,
-                                                                     "category":  18,
+                                                                     "category":  21,
                                                                      "nameResourceKey":  "requireEncryptedBackupName",
                                                                      "descriptionResourceKey":  "requireEncryptedBackupDescription",
                                                                      "childSettings":  [
@@ -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

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

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

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

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

Documentation/ObjectInfo/connecteddevices_iosgeneral.json

@@ -1,16 +1,16 @@
-{
+{
     "connecteddevices_iosgeneral":  [
                                         {
                                             "isSettingDescription":  false,
                                             "showAsSectionHeader":  true,
                                             "dataType":  8,
-                                            "category":  20,
+                                            "category":  23,
                                             "nameResourceKey":  "allEnrollmentTypesHeaderName",
                                             "descriptionResourceKey":  "allEnrollmentTypesHeaderDescription",
                                             "childSettings":  [
                                                                   {
                                                                       "dataType":  0,
-                                                                      "category":  20,
+                                                                      "category":  23,
                                                                       "nameResourceKey":  "forceWatchWristDetectionName",
                                                                       "descriptionResourceKey":  "forceWatchWristDetectionDescription",
                                                                       "childSettings":  [
@@ -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

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

Documentation/ObjectInfo/connectivity_androidgeneral.json

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

Documentation/ObjectInfo/connectivity_windows10general.json

@@ -1,8 +1,8 @@
-{
+{
     "connectivity_windows10general":  [
                                           {
                                               "dataType":  16,
-                                              "category":  21,
+                                              "category":  24,
                                               "nameResourceKey":  "cellularDataName",
                                               "descriptionResourceKey":  "cellularDataDescription",
                                               "childSettings":  [
@@ -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

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

@@ -1,21 +1,21 @@
-{
+{
     "contentcaching_macdevicefeatures":  {
                                              "isSettingDescription":  false,
                                              "showAsSectionHeader":  true,
                                              "dataType":  8,
-                                             "category":  22,
+                                             "category":  25,
                                              "nameResourceKey":  "allEnrollmentTypesHeaderNameMac",
                                              "descriptionResourceKey":  "allEnrollmentTypesHeaderDescriptionMac",
                                              "childSettings":  [
                                                                    {
                                                                        "dataType":  0,
-                                                                       "category":  22,
+                                                                       "category":  25,
                                                                        "nameResourceKey":  "contentCachingEnabledName",
                                                                        "descriptionResourceKey":  "contentCachingEnabledDescription",
                                                                        "childSettings":  [
                                                                                              {
                                                                                                  "dataType":  16,
-                                                                                                 "category":  22,
+                                                                                                 "category":  25,
                                                                                                  "nameResourceKey":  "contentCachingTypeName",
                                                                                                  "descriptionResourceKey":  "contentCachingTypeDescription",
                                                                                                  "childSettings":  [
@@ -45,8 +45,8 @@
                                                                                                  "enabled":  true
                                                                                              },
                                                                                              {
-                                                                                                 "dataType":  14,
-                                                                                                 "category":  22,
+                                                                                                 "dataType":  15,
+                                                                                                 "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,15 +1,32 @@
-{
+{
     "customcompliance_compliancewindows10":  {
+                                                 "dataType":  0,
+                                                 "category":  151,
+                                                 "nameResourceKey":  "AdminConfiguredComplianceSettingName",
+                                                 "descriptionResourceKey":  "CustomComplianceToolTip",
+                                                 "childSettings":  [
+                                                                       {
                                                                            "dataType":  25,
-                                                 "category":  143,
+                                                                           "category":  151,
                                                                            "childSettings":  [
 
                                                                                              ],
                                                                            "options":  [
 
                                                                                        ],
+                                                                           "entityKey":  "customCompliance",
                                                                            "booleanActions":  0,
                                                                            "policyType":  35,
                                                                            "enabled":  true
                                                                        }
+                                                                   ],
+                                                 "options":  [
+
+                                                             ],
+                                                 "entityKey":  "customComplianceRequired",
+                                                 "booleanActions":  1,
+                                                 "defaultValue":  false,
+                                                 "policyType":  35,
+                                                 "enabled":  true
+                                             }
 }

Documentation/ObjectInfo/customconfiguration_ioscustom.json

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

Documentation/ObjectInfo/customconfiguration_maccustom.json

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

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

Documentation/ObjectInfo/customomasettings_androidforworkcustom.json

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

Documentation/ObjectInfo/customomasettings_windows10custom.json

@@ -1,10 +1,10 @@
-{
+{
     "customomasettings_windows10custom":  {
                                               "columns":  [
                                                               {
                                                                   "metadata":  {
                                                                                    "dataType":  20,
-                                                                                   "category":  26,
+                                                                                   "category":  29,
                                                                                    "nameResourceKey":  "nameName",
                                                                                    "descriptionResourceKey":  "empty",
                                                                                    "childSettings":  [
@@ -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

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

Documentation/ObjectInfo/custompreferences_maccustompreferences.json

@@ -1,8 +1,8 @@
-{
+{
     "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":  [