v4.0.1: per-user app naming, auth deletion, TUI onboarding flow, PIM docs

chore: bump VERSION to 4.0.1
feat(ui): detect missing fzf and show installation hints
2026-04-16 15:40:33 +02:00 · 2026-04-16 11:36:09 +02:00 · 2026-04-16 11:34:03 +02:00 · 2026-04-16 11:02:54 +02:00 · 2026-04-14 19:51:16 +02:00 · 2026-04-14 19:43:54 +02:00
484 changed files with 6583 additions and 502214 deletions
--- a/.gitignore
+++ b/.gitignore
@@ -9,4 +9,8 @@
 /*.old
 /Extensions/*.zip
 .gitignore
-CloudAPIPowerShellManagement.log
+IntuneManagement.log
 GraphMetaData.xml
 %LOCALAPPDATA%/
 *%LOCALAPPDATA%*
 CloudAPIPowerShellManagement/
--- a/ADMXExample.png
+++ b/ADMXExample.png
--- a/ADMXImport.md
+++ b/ADMXImport.md
@@ -1,214 +0,0 @@
 # ADMX Ingestion
 The script can create Custom Profiles based on ADMX ingestion. ADMX ingestion is a way to support existing ADMX files in an MDM environment. Windows uses the [Policy CSP](https://docs.microsoft.com/en-us/windows/client-management/mdm/policy-configuration-service-provider) to apply the configuration. 
 Microsoft links:
 * ADMX Ingestion documentation can be found [here](https://docs.microsoft.com/en-us/windows/client-management/mdm/understanding-admx-backed-policies) and [here](https://docs.microsoft.com/en-us/windows/client-management/mdm/enable-admx-backed-policies-in-mdm)
 * Additional information including blocked registry keys can be found [here](https://docs.microsoft.com/en-us/windows/client-management/mdm/win32-and-centennial-app-policy-configuration)  
 * Shema definition documentation can be found [here](https://docs.microsoft.com/en-us/openspecs/windows_protocols/ms-gpreg/6e10478a-e9e6-4fdc-a1f6-bdd9bd7f2209)
 * Old ADMX schema documentation (Vista) including attribute information can be found [here](http://download.microsoft.com/download/5/0/8/5081217f-4a2a-470e-a7fa-5976e40b0839/Group%20Policy%20ADMX%20Syntax%20Reference%20Guide.doc)
 * Another schema documentation including attribute information can be found [here](https://docs.microsoft.com/en-us/previous-versions/windows/desktop/policy/admx-schema)
 ## ADMX Import
 The **ADMX Import** tool is used for configuring 3rd party applications e.g. Chrome, Google Update etc. These ADMX files are available from the software vendor. An ADMX can be loaded in the tool and all settings can be configured using a similar UI as GPMC. When the ADMX is loaded, the script will look for an ADML file that is either in the same directory or in the en-US subdirectory. An ADML file can also be loaded manually, if another language should be used in the UI.
 <img src="https://raw.githubusercontent.com/Micke-K/IntuneManagement/master/ADMXExample.png" height="50%" width="50%"/>
 The image above shows the the tool after the chrome.admx file was loaded. The tool supports delivering ADMX settings to HKLM (Computer Settings) and HKCU (User Settings). Categories will be added based on the Class attribute for each ADMX policy setting. The *All settings* category will display all the settings for the base category (Computer or User)
 <img src="https://raw.githubusercontent.com/Micke-K/IntuneManagement/master/ADMXSettingExample.png" height="50%" width="50%"/>
 A policy setting can either be edited via double-clicking an item or right-clicking and select Edit. 
 The *Intune OMA-URI name* property specifies the name of the OMA-URI row in the Custom Profile. This is optional and if it is not specified, the script will use the name of the policy.
 A policy must be set to Enabled before any changes can be made. The *Policy* tab will list all possible settings for the policy. This could be a dropdown box, text box, check box, numeric up-down box etc. The script creates the controls based on the presentation settings in the ADML file. An ADML is not mandatory but the controls and the UI could cause unpredictable results. Always use the associated ADML for correctly generated controls.
 <img src="https://raw.githubusercontent.com/Micke-K/IntuneManagement/master/ADMXSettingExampleOMAURI.png" height="50%" width="50%"/>
 The *OMA-URI Settings* tab contains the configured settings. This is the string that will be added to the enabled policy. This can be manually configured in case there is something that is not supported by the script. Do **NOT** add <enabled /> or <disabled /> to this text box. The script will add that automatically.  If *Manual configuration* is checked, the script will upload the text as it is specified, including additional manual changes. If it is not checked, the script will generate the text when importing the profile. If manual configuration is added and then checkbox is cleared, those changes will be lost during the upload.
 The *XML Definition* tab contains the XML node for the ADMX policy. This is used for reference in case manual configuration is required.
 <img src="https://raw.githubusercontent.com/Micke-K/IntuneManagement/master/ADMXImportSetting.png" height="50%" width="50%"/>
 The *Import* tab  is used for creating the Custom Profile in Intune. The *Custom Profile Name* is mandatory and specifies the name of the profile.  
 The *ADMX Policy File Name* is mandatory and this should be a globally unique name. This will generate an ADMX file on the client. See the Deep Dive section for more information.
 The *ADMX App Id* is mandatory and this does not have to be unique but it is recommended in some circumstances e.g. if multiple versions of the Chrome ADMX file is uploaded, it is recommended to add the version to the *ADMX Policy File Name* and *ADMX App Id* e.g. Chrome91. See the Deep Dive section for more information.
 The *Ingest ADMX file* is checked by default and this will included the ADMX file ingestion in the Custom Profile. If there will be multiple Custom Profiles based on the same ADMX file, it might be better to have one Custom Profile for the ADMX ingestion and one separate Custom Profile for each of the settings. This requires that the same *ADMX App Id* is used for each Custom Profile that is based in the ingested ADMX file. 
 The *OMA-URI Name  for the ADMX ingestion* specifies the name of the OMA-URI row inside the Custom Profile. This is optional. It will be set to a value based on the loaded file name by default e.g. chrome.admx Ingestion.
 The *Import* button will create the Custom Profile in Intune. There is no visual information if the profile was created successfully but the log will display the name and id of the created profile. A message box will be displayed if it fails to create the Custom Profile. 
 ## Reg Values
 The **Reg Values** tool can be used to create registry values in HKLM and HKCU. This uses the same functionality as the ADMX Import tool; ADMX ingestion. The difference is that the Reg Values tool builds the ADMX file in the background based on the added registry values. There are some benefits of using this over a PowerShell script e.g. Intune will state if the registry keys were applied successfully and if a conflict or an error occurred.  
 <img src="https://raw.githubusercontent.com/Micke-K/IntuneManagement/master/ADMXRegValuePolicy.png" height="50%" width="50%"/>
 The initial screen include the options of specifying the Custom Profile name and description. The *Policy type* can either be Policy or Preferences. See Known Issues and Limitations for more information about policy types.
 The *Added reg values* list contains the ADMX policies. Each ADMX policy can contain one or more registry values.
 The top part of the *Add new reg policy* form specifies the attributes on the policy node in the ADMX file. The *Policy name* identifies the policy. This cannot contain any spaces. The *Policy status* property specifies if the policy should be enabled or disabled. The hive and the key properties specifies where the registry values should be added. The *Reg key* property is a global value for all added registry values in the bottom section.
 The *Policy value* is an optional value. This should only be used if the registry policy should add a value that specifies if it is enabled/disable e.g. 1 or 0. This will use the enabledValue and disabledValue nodes in the background. If this value is specified, a registry value (DWORD) will be set to 1 when the policy is enabled or 0 if the policy is disabled.
 The lower part of the form specifies individual registry values. The tool support creating/setting the following type of registry values:
 * String
 * Expanded string (String with Expanded checked)
 * Multi-string
 * DWORD
 * List - a key/value string list. Each key will be a string value.
 The *Key* property is not required unless the value is located in a different location than specified in the *Reg key* property. This is used when specifying values for the List type. The List type values will then be added to a separate key.
 **Note:** The List type does not support specifying the value name since all values are creating in a separate key.
 *Value name* and *Value* properties specifies the values that should be created in the registry. 
 Modify existing values by double-clicking on the value in the *Added reg values* list.
 The *Additional value settings* section has additional settings for a policy type. This can be used to create a REG_EXPAND_SZ instead of a REG_SZ etc.
 **Note:** The *Do not overwrite value* will set the soft attribute. This does **NOT** work, at least not outside the Software\Policies area on a cloud only joined device. This property is kept until more testing can confirm that it doesn't work at all.
 Example of setting registry values for a device and a user: 
 <img src="https://raw.githubusercontent.com/Micke-K/IntuneManagement/master/RegPolicyHKCU.png" height="50%" width="50%"/>
 Example of adding HKCU settings
 <img src="https://raw.githubusercontent.com/Micke-K/IntuneManagement/master/RegPolicyHKLM.png" height="50%" width="50%"/>
 Example of adding HKLM settings
 <img src="https://raw.githubusercontent.com/Micke-K/IntuneManagement/master/RegADMXFileContent.png" height="50%" width="50%"/>
 Example of generated ADMX file
 <img src="https://raw.githubusercontent.com/Micke-K/IntuneManagement/master/RegValueIntuneProfile.png" height="50%" width="50%"/>
 Example of the created Custom Profile created. 
 <img src="https://raw.githubusercontent.com/Micke-K/IntuneManagement/master/RegProfileADMXIngestion.png" height="50%" width="50%"/>
 Example of the OMA-URI row for ADMX ingestion for a custom registry value.
 <img src="https://raw.githubusercontent.com/Micke-K/IntuneManagement/master/RegProfileOMAURISetting.png" height="50%" width="50%"/>
 Example of the OMA-URI row for specifying the registry values to set.
 <img src="https://raw.githubusercontent.com/Micke-K/IntuneManagement/master/RegValuesHKCU.png" height="50%" width="50%"/>
 Example of the implemented HKCU settings for a user
 <img src="https://raw.githubusercontent.com/Micke-K/IntuneManagement/master/RegValuesHKLM.png" height="50%" width="50%"/>
 Example of the implemented HKLM settings for a device
 <img src="https://raw.githubusercontent.com/Micke-K/IntuneManagement/master/RegValuesHKLMList.png" height="50%" width="50%"/>
 Example of the List type implementation on a device 
 ## Deep Dive
 The [Policy CSP](https://docs.microsoft.com/en-us/windows/client-management/mdm/policy-configuration-service-provider) is used when ingesting ADMX files. When a Custom Profile with ADMX ingestion is assigned to a device, the Policy CSP will add information about the ADMX file in the registry and create an ADMX file in the file system.
 **ADMX ingestion:**
 An ADMX is ingested by using the following OMA-URI path:
 ./device/Vendor/MSFT/Policy/ConfigOperations/ADMXInstall/<AppID>/[Policy|Preference]/<ADMXFileName>
 Example:
 ./device/Vendor/MSFT/Policy/ConfigOperations/ADMXInstall/Chrome/Policy/ChromeAdmx
 This will generate an ADMX file, ChromeAdmx.admx, in the following folder on the device:
 %ProgramData%\Microsoft\PolicyManager\ADMXIngestion\\<ProviderGuid>\\<AppID>\\[Policy|Preference]
 The Reg Values tool will always use IntuneManagementReg as AppId. Each uploaded reg policy will have a unique named ADMX file, RegPolicy_<GUID>. 
 The Policy CSP will create multiple registry values under HKLM\Software\Microsoft\PolicyManager
 The ADMXDefault part will contain each Category, with full path, specified in the ADMX file. This is why the AppID must be unique when using multiple versions of the same admx file since each of these files will have the same category IDs e.g. each Chrome version should be named based on the version like Chromev91.
 <img src="https://raw.githubusercontent.com/Micke-K/IntuneManagement/master/RegADMXDefault.png" height="50%" width="50%"/>
 **Note:** If the same ADMX filename is used, the first file saved will win. It looks like Intune will not overwrite an existing ADMX file. That is why a unique name must be specified when different versions of the ADMX file is used.
 There is an additional registry key added for the ADMX ingestion. Each ingested file will generate a key under AdmxInstalled.
 AdmxInstalled\<ProviderGuid>\\<AppID>\\[Policy|Preference]\\<ADMXFileName>
 Example:
 \SOFTWARE\Microsoft\PolicyManager\AdmxInstalled\D12FCE57-F71E-4D0D-93EE-35C5E6F8C0D9\Chrome\Policy\ChromeAdmx
 This key contains information when it was added, status and how many policies it has.
 **Policy Settings**
 Each setting is added based on the following OMA-URI path:
 ./[User|Device]/vendor/msft/policy/config/<AppID>~[Policy|Preference]~<CategoryPath>/<PolicyName>
 Example:
 ./Device/Vendor/MSFT/Policy/Config/Chrome~Policy~googlechrome~Startup/ShowHomeButton
 The CategoryPath is the full path to the category where the setting is defined. Each categoryId is separated with a ~. This should match the registry value specified in the image above in the ADMXDefault key. 
 One registry key for each ADMX policy is created under the Provider path (PolicyManager\Provider\\<GUID>) . This includes the OME-URI settings configured in the Custom Profile. 
 <img src="https://raw.githubusercontent.com/Micke-K/IntuneManagement/master/RegADMXProvider.png" height="50%" width="50%"/>
 Applied settings are added to the Current registry key, Current\Device or Current\\<SID> depending if it is for the device or the user. There is one key for each policy category.
 <img src="https://raw.githubusercontent.com/Micke-K/IntuneManagement/master/RegADMXCurrent.png" height="50%" width="50%"/>
 **Troubleshooting**
 The Event Viewer can be used for troubleshooting any issues with ADMX ingestion. The events are added to the following log:
 Application and Services log\Microsoft\Windows\DeviceManagement-Enterprise-Diagnostics-Provider\Admin
 The following events can be used for troubleshooting:
 * 819 - Information: The policy settings was successfully deleted 
 * 831 - Information: The policy settings was successfully added 
 * 866 - Information: Update policy (This is followed after a 872 or 873 event)
 * 872 - Information: Start updating existing ADMX ingestion
 * 873 - Information: Starting new ADMX ingestion
 * 865 - Error  Catastrophic Failure. This could be that the ADMX is invalid. 
 * 404 - Error: This is generated for different reason
  * Generated after a 865 Catastrophic Failure error
  * The system cannot find the file. The CSP cannot file the specified ADMX file. This could happen when ADMX and policies are in separate Custom Profiles and the wrong AppID was specified in the OMA+URI paths or if the policy settings are applied before the ADMX ingestion.
 * 454 - Error: This is listed when the Custom Profile is removed and the CSP cannot delete registry values outside Software\Policies.  
 ## Known Issues and Limitations
 * The created ADMX ingestion profiles has only been tested on cloud only joined devices.  
 * According to [this](https://docs.microsoft.com/en-us/windows/client-management/mdm/win32-and-centennial-app-policy-configuration) link, policies will NOT be enforced unless the device is domain joined. So only Hybrid devices would support enforced values. This means that all settings on cloud only joined devices will be set as Preference values e.g. set once and never updated.
 **ADMX Import:**
 * Only categories and policy names specified in the loaded ADMX/ADML file will be translated. If the ADMX uses strings outside the loaded ADML file, it might be blank or using the string id.  
 **Reg Values**
 * The Preferences type is supported by the tool but tests shows that there is no difference in functionality compared to the Policy type on cloud only joined devices.  
 * The script will block some registry keys. These keys are blocked by Microsoft and a PowerShell script is required to write to these values. See [this](https://docs.microsoft.com/en-us/windows/client-management/mdm/win32-and-centennial-app-policy-configuration) link for more information.
 * Values outside Software\Policies will **NOT** be deleted when the policy is removed.
 * The tool supports all ADMX attributes specified in the schema but it looks like some functionalities are not supported by Windows or the Policy CSP e.g. the *soft* attribute should be set to true to avoid overwriting an existing value but all values were overwritten during the tests, even if the soft attribute was set. 
 * QWORD is not supported. The ADMX schema definition includes longDecimal which would create QWORD values but this is not supported in the Policy CSP. It will generate a Catastrophic Failure event in the Event Log. 
 * No support for enabledList/disabledList. This might be added in the future since this could make it very easy to create mapped drives via ADMX ingestion. 
--- a/ADMXImportSetting.png
+++ b/ADMXImportSetting.png
--- a/ADMXRegValuePolicy.png
+++ b/ADMXRegValuePolicy.png
--- a/ADMXSettingExample.png
+++ b/ADMXSettingExample.png
--- a/ADMXSettingExampleOMAURI.png
+++ b/ADMXSettingExampleOMAURI.png
--- a/Baselines/OpenIntuneBaseline.example.yaml
+++ b/Baselines/OpenIntuneBaseline.example.yaml
@@ -0,0 +1,81 @@
 baseline:
  name: OpenIntuneBaseline-v3-Example
  conflictResolution: Skip      # Skip | Update | Error
  whatIf: false
  # Global name mutation applied to every policy (optional)
  tenantMutation:
    search: "OIB-"
    replace: "CONTOSO-"
    # Alternatively use prefix instead of search/replace:
    # prefix: "CONTOSO-"
  # Cloud-only security groups to create if they do not exist
  groups:
    - displayName: "Baseline - Windows Devices"
      mailNickname: "BaselineWinDevices"
      securityEnabled: true
    - displayName: "Baseline - macOS Devices"
      mailNickname: "BaselineMacDevices"
      securityEnabled: true
    - displayName: "Baseline - Pilot Users"
      mailNickname: "BaselinePilotUsers"
      securityEnabled: true
  policies:
    # Device Configuration
    - sourcePath: ./policies/OIB-Windows-Defender-ASR.json
      type: DeviceConfiguration
      assignments:
        - targetType: Group
          groupName: "Baseline - Windows Devices"
    # Settings Catalog (uses 'name' instead of displayName)
    - sourcePath: ./policies/OIB-SettingsCatalog-LoginWindow.json
      type: SettingsCatalog
      # Per-policy mutation override
      mutation:
        search: "OIB-"
        replace: "CONTOSO-"
      assignments:
        - targetType: Group
          groupName: "Baseline - macOS Devices"
        - targetType: AllDevices
    # Compliance Policy
    - sourcePath: ./policies/OIB-Compliance-Windows.json
      type: CompliancePolicies
      assignments:
        - targetType: Group
          groupName: "Baseline - Windows Devices"
    # Endpoint Security (DeviceManagementIntents)
    # If a sibling file *_Settings.json exists, it will be imported automatically.
    - sourcePath: ./policies/OIB-EndpointSecurity-Defender.json
      type: EndpointSecurity
      assignments:
        - targetType: Group
          groupName: "Baseline - Windows Devices"
    # Administrative Templates
    - sourcePath: ./policies/OIB-ADMX-OfficeSettings.json
      type: AdministrativeTemplates
      assignments:
        - targetType: Group
          groupName: "Baseline - Pilot Users"
    # macOS Script
    - sourcePath: ./policies/OIB-MacScript-CompanyBranding.json
      type: MacScripts
      assignments:
        - targetType: Group
          groupName: "Baseline - macOS Devices"
    # Application (metadata JSON only; .intunewin binary upload is NOT handled here)
    - sourcePath: ./apps/OIB-CompanyPortal.json
      type: Applications
      assignments:
        - targetType: AllUsers
          intent: Available
        - targetType: AllDevices
          intent: Required
--- a/Bin/6.35.0/Microsoft.IdentityModel.Abstractions.dll
+++ b/Bin/6.35.0/Microsoft.IdentityModel.Abstractions.dll
--- a/Bin/Microsoft.Identity.Client.Broker.dll
+++ b/Bin/Microsoft.Identity.Client.Broker.dll
--- a/Bin/Microsoft.Identity.Client.Desktop.dll
+++ b/Bin/Microsoft.Identity.Client.Desktop.dll
--- a/Bin/Microsoft.Identity.Client.Extensions.Msal.dll
+++ b/Bin/Microsoft.Identity.Client.Extensions.Msal.dll
--- a/Bin/Microsoft.Identity.Client.NativeInterop.dll
+++ b/Bin/Microsoft.Identity.Client.NativeInterop.dll
--- a/Bin/Microsoft.Identity.Client.dll
+++ b/Bin/Microsoft.Identity.Client.dll
--- a/Bin/Microsoft.IdentityModel.Abstractions.dll
+++ b/Bin/Microsoft.IdentityModel.Abstractions.dll
--- a/Bin/Microsoft.WindowsAPICodePack.Shell.dll
+++ b/Bin/Microsoft.WindowsAPICodePack.Shell.dll
--- a/Bin/Microsoft.WindowsAPICodePack.dll
+++ b/Bin/Microsoft.WindowsAPICodePack.dll
--- a/Bin/msalruntime.dll
+++ b/Bin/msalruntime.dll
--- a/Bin/msalruntime_arm64.dll
+++ b/Bin/msalruntime_arm64.dll
--- a/Bin/msalruntime_x86.dll
+++ b/Bin/msalruntime_x86.dll
--- a/CHANGELOG_macOS_IntuneToolkit.md
+++ b/CHANGELOG_macOS_IntuneToolkit.md
@@ -0,0 +1,103 @@
 # macOS Intune Toolkit Changelog
 ## 2026-04-16 — v4.0.1 — Accountability, PIM & Auth Management
 ### Modified
 - **`Scripts/Initialize-IntuneAuth.ps1`**
  - App registrations are now named after the **authenticated Entra user** (e.g., `IntuneManagement-tomas.kracmar@cqre.net`) instead of the local OS username. This improves audit-log traceability when multiple admins use the toolkit against the same tenant.
  - Added `-Delete` switch to remove local tenant credentials (`Settings.json` + macOS Keychain) without touching the Entra app registration.
  - Added `-DeleteApp` switch to delete both the **Entra app registration** and local credentials.
  - Onboarding now automatically caches the tenant display name after auth setup, so the TUI shows friendly names immediately.
  - Added `Organization.Read.All` to the `Connect-MgGraph` scopes to support tenant name caching.
 - **`Scripts/Start-IntuneToolkit.ps1`**
  - Added menu items **14** (delete local auth) and **15** (delete auth + app registration) to the TUI.
  - Selecting **"[+ Onboard new tenant]"** now runs the auth initializer immediately and restarts the launcher, instead of dropping into the main menu for an unconfigured tenant.
  - The TUI now exits cleanly after deleting tenant auth.
 - **`README.md`**
  - Added **Accountability & PIM caveats** section explaining the trade-offs of app-only auth versus delegated auth, and how app naming affects audit logs.
 ---
 ## 2026-04-13 — API Permissions Sync for `Initialize-IntuneAuth.ps1`
 ### Modified
 - **`Scripts/Initialize-IntuneAuth.ps1`**
  - Unified the required Microsoft Graph application permissions into a single `$requiredRoles` list defined before app creation/reuse logic:
    - `DeviceManagementApps.ReadWrite.All`
    - `DeviceManagementConfiguration.ReadWrite.All`
    - `DeviceManagementManagedDevices.ReadWrite.All`
    - `DeviceManagementScripts.ReadWrite.All`
    - `DeviceManagementServiceConfig.ReadWrite.All`
    - `DeviceManagementRBAC.ReadWrite.All`
    - `Group.ReadWrite.All`
    - `Directory.Read.All`
    - `User.Read.All`
    - `Organization.Read.All`
    - `Policy.ReadWrite.ConditionalAccess`
    - `Agreement.ReadWrite.All`
    - `CloudPC.ReadWrite.All`
    - `Application.Read.All`
  - **Existing app patching**: When reusing an existing app registration, the script now inspects its current `RequiredResourceAccess`. If any required permissions are missing, it patches the app via `Update-MgApplication`, refreshes the local app object, and the downstream admin-consent loop automatically grants consent for the newly added roles.
 ---
 ## Prior delivered changes (context summary)
 ### New scripts added
 - `Scripts/Bulk-AppAssignment.ps1` — bulk-assign apps to groups/All Users/All Devices
 - `Scripts/Bulk-AssignmentManager.ps1` — add/remove assignments for any policy type using correct `@odata.type` and bulk `/assign` endpoint
 - `Scripts/Backup-Restore-Assignments.ps1` — JSON backup with cross-tenant group name resolution
 - `Scripts/Export-AssignmentsToCsv.ps1` — CSV and Markdown documentation output
 - `Scripts/Bulk-RenamePolicies.ps1` — search/replace, add/strip prefix across displayName/description
 - `Scripts/Bulk-DeviceOperations.ps1` — delete/retire/wipe/lock/sync with `-WhatIf` safeguards
 - `Scripts/Start-IntuneToolkit.ps1` — unified reverse-numbered `fzf`-based launcher
 - `Scripts/Initialize-IntuneAuth.ps1` — one-time Entra app + secret + Keychain setup
 ### Core / Extensions / Headless changes
 - **`Extensions/MSGraph.psm1`**
  - `Invoke-GraphRequest` now throws on 4xx/5xx HTTP errors (was silently returning null)
  - Added `-AllPages` support to `Get-GraphObjects` and toolkit queries for large tenants
 - **`Headless/IntuneManagement.Headless.psm1`**
  - Expanded `Get-DefaultIntunePolicyObjectTypes` to ~45 types, including `DeviceManagementIntents`
  - Threaded `NameSearchPattern` / `NameReplacePattern` through export/import/action flows
 - **Settings Catalog fixes**
  - Uses `name` property instead of `displayName` for queries/labels
  - Assignments use `#microsoft.graph.deviceManagementConfigurationPolicyAssignment` and the bulk `POST …/assign` endpoint
 - **TUI / `fzf`**
  - Spacebar toggle, Esc to go back, reverse numbering (10→1) in unified launcher
 ## 2026-04-13 — Declarative Baseline Deployer
 ### Added
 - **`Scripts/Deploy-IntuneBaseline.ps1`**
  - YAML-driven one-click deployment of Intune policies + assignments to new tenants.
  - Supports global and per-policy name mutations (`search`/`replace` or `prefix`).
  - Auto-creates cloud-only security groups if missing.
  - Idempotent imports with configurable conflict resolution (`Skip`, `Update`, `Error`).
  - Full `-WhatIf` dry-run support.
  - Handles 20+ policy types including Settings Catalog (`name` property), EndpointSecurity (settings file companion upload), and Applications.
  - Integrates with existing auth stack (Settings.json / macOS Keychain).
 - **`Scripts/ConvertTo-IntuneBaseline.ps1`**
  - Converts an existing toolkit export folder into a baseline YAML skeleton.
  - Maps folder names to baseline types, extracts display names, and generates empty assignment blocks.
 - **`Baselines/OpenIntuneBaseline.example.yaml`**
  - Example manifest demonstrating groups, mutations, policies, and assignments.
 ### Dependencies
 - `powershell-yaml` module (auto-install prompt if missing).
 ## 2026-04-13 — Unified Launcher: Baseline Deployer Integration
 ### Modified
 - **`Scripts/Start-IntuneToolkit.ps1`**
  - Added menu entries for baseline deployment:
    - `10. Deploy baseline`
    - `11. Deploy baseline (dry-run / WhatIf)`
  - Forwards `-WhatIf` switch correctly when dry-run option is selected.
  - Ensures `WhatIf` flag is cleared between loop iterations to avoid leakage to other tools.
--- a/CloudAPIPowerShellManagement.psd1
+++ b/CloudAPIPowerShellManagement.psd1
@@ -1,123 +0,0 @@
 #
 # Module manifest for module 'CloudAPIPowerShellManagement'
 #
 # Generated by: Mikael Karlsson
 #
 # Generated on: 21/02/2021
 #
@{
 # Script module or binary module file associated with this manifest.
 RootModule = 'CloudAPIPowerShellManagement.psm1'
 # Version number of this module.
 ModuleVersion = '3.10.1'
 # Supported PSEditions
 # CompatiblePSEditions = @()
 # ID used to uniquely identify this module
 GUID = '3c4b3f21-256d-4be0-b106-abcd49ad6423'
 # Author of this module
 Author = 'Mikael Karlsson'
 # Company or vendor of this module
 # CompanyName = ''
 # Copyright statement for this module
 Copyright = '(c) 2023 Mikael Karlsson. Software released under MIT License.'
 # Description of the functionality provided by this module
 Description = 'Management of Intune and Azure via Cloud APIs like Microsoft Graph API'
 # Minimum version of the Windows PowerShell engine required by this module
 # PowerShellVersion = ''
 # Name of the Windows PowerShell host required by this module
 # PowerShellHostName = ''
 # Minimum version of the Windows PowerShell host required by this module
 # PowerShellHostVersion = ''
 # Minimum version of Microsoft .NET Framework required by this module. This prerequisite is valid for the PowerShell Desktop edition only.
 # DotNetFrameworkVersion = ''
 # Minimum version of the common language runtime (CLR) required by this module. This prerequisite is valid for the PowerShell Desktop edition only.
 # CLRVersion = ''
 # Processor architecture (None, X86, Amd64) required by this module
 # ProcessorArchitecture = ''
 # Modules that must be imported into the global environment prior to importing this module
 # RequiredModules = @()
 # Assemblies that must be loaded prior to importing this module
 # RequiredAssemblies = @()
 # Script files (.ps1) that are run in the caller's environment prior to importing this module.
 # ScriptsToProcess = @()
 # Type files (.ps1xml) to be loaded when importing this module
 # TypesToProcess = @()
 # Format files (.ps1xml) to be loaded when importing this module
 # FormatsToProcess = @()
 # Modules to import as nested modules of the module specified in RootModule/ModuleToProcess
 NestedModules = @()
 # Functions to export from this module, for best performance, do not use wildcards and do not delete the entry, use an empty array if there are no functions to export.
 FunctionsToExport = @("Initialize-CloudAPIManagement")
 # Cmdlets to export from this module, for best performance, do not use wildcards and do not delete the entry, use an empty array if there are no cmdlets to export.
 # CmdletsToExport = @()
 # Variables to export from this module
 # VariablesToExport = ""
 # Aliases to export from this module, for best performance, do not use wildcards and do not delete the entry, use an empty array if there are no aliases to export.
 AliasesToExport = @()
 # DSC resources to export from this module
 # DscResourcesToExport = @()
 # List of all modules packaged with this module
 ModuleList = @("CloudAPIPowerShellManagement.psm1")
 # List of all files packaged with this module
 # FileList = @()
 # Private data to pass to the module specified in RootModule/ModuleToProcess. This may also contain a PSData hashtable with additional module metadata used by PowerShell.
 PrivateData = @{
    PSData = @{
        # Tags applied to this module. These help with module discovery in online galleries.
        Tags = @("Intune","EndpointManager","IntuneManagement","Microsoft Graph","PowerShell","WPF", "Cloud API")
        # A URL to the license for this module.
        LicenseUri = 'https://github.com/Micke-K/IntuneManagement/LICENSE'
        # A URL to the main website for this project.
        ProjectUri = 'https://github.com/Micke-K/IntuneManagement'
        # A URL to an icon representing this module.
        # IconUri = ''
        # ReleaseNotes of this module
        # ReleaseNotes = ''
    } # End of PSData hashtable
 } # End of PrivateData hashtable
 # HelpInfo URI of this module
 # HelpInfoURI = ''
 # Default prefix for commands exported from this module. Override the default prefix using Import-Module -Prefix.
 # DefaultCommandPrefix = ''
 }
--- a/CloudAPIPowerShellManagement.psm1
+++ b/CloudAPIPowerShellManagement.psm1
@@ -1,238 +0,0 @@
 #region Console functions
 function Test-IsWindowsPlatform
 {
    return ([Environment]::OSVersion.Platform -eq [System.PlatformID]::Win32NT)
 }
 function Invoke-AppDoEvents
 {
    if("System.Windows.Forms.Application" -as [type])
    {
        [System.Windows.Forms.Application]::DoEvents()
    }
 }
 # https://stackoverflow.com/questions/40617800/opening-powershell-script-and-hide-command-prompt-but-not-the-gui
 if(Test-IsWindowsPlatform)
 {
 Add-Type -Name Window -Namespace Console -MemberDefinition '
 [DllImport("Kernel32.dll")]
 public static extern IntPtr GetConsoleWindow();
 [DllImport("user32.dll")]
 public static extern bool ShowWindow(IntPtr hWnd, Int32 nCmdShow);
 [DllImport("user32.dll")]
 public static extern bool SetForegroundWindow(IntPtr hWnd);
 [DllImport("kernel32.dll", SetLastError = true)]
 public static extern bool SetConsoleIcon(IntPtr hIcon);
 [DllImport("user32.dll")] 
 public static extern int SendMessage(int hWnd, uint wMsg, uint wParam, IntPtr lParam); 
 '
 }
 function Show-Console
 {
    if(-not (Test-IsWindowsPlatform)) { return }
    $consolePtr = [Console.Window]::GetConsoleWindow()
    # Hide = 0,
    # ShowNormal = 1,
    # ShowMinimized = 2,
    # ShowMaximized = 3,
    # Maximize = 3,
    # ShowNormalNoActivate = 4,
    # Show = 5,
    # Minimize = 6,
    # ShowMinNoActivate = 7,
    # ShowNoActivate = 8,
    # Restore = 9,
    # ShowDefault = 10,
    # ForceMinimized = 11
    [Console.Window]::ShowWindow($consolePtr, 4)
 }
 function Hide-Console
 {
    if(-not (Test-IsWindowsPlatform)) { return }
    $consolePtr = [Console.Window]::GetConsoleWindow()
    #0 hide
    [Console.Window]::ShowWindow($consolePtr, 0) | Out-Null
 }
 #endregion
 # Unblock all files
 # Not 100% OK but avoid issues with loading blocked files
 function Unblock-AllFiles
 {
    param($folder)
    (Get-ChildItem $folder -force | Where-Object {! $_.PSIsContainer}) | Unblock-File
    foreach($subFolder in (Get-ChildItem $folder -force | Where-Object {$_.PSIsContainer}))
    {
        Unblock-AllFiles $subFolder.FullName
    }
 }
 function Initialize-CloudAPIManagement
 {
    [CmdletBinding(SupportsShouldProcess=$True)]
    param(
        [string]
        $View = "",
        [switch]
        $ShowConsoleWindow,
        [switch]
        $JSonSettings,
        [string]
        $JSonFile,
        [switch]
        $Silent,
        [string]
        $SilentBatchFile,
        [string]
        $tenantId,
        [string]
        $appId,
        [string]
        $secret,
        [string]
        $certificate,
        [string]
        $GraphEnvironment,
        [string]
        $GCCType
    )
    $PSModuleAutoloadingPreference = "none"
    $global:hideUI = ($Silent -eq $true)
    $global:SilentBatchFile = $SilentBatchFile
    $global:wpfNS = "xmlns='http://schemas.microsoft.com/winfx/2006/xaml/presentation' xmlns:x='http://schemas.microsoft.com/winfx/2006/xaml'"
    if($global:hideUI -ne $true)
    {
        [void] [System.Reflection.Assembly]::LoadWithPartialName("System.Windows.Forms") 
        Add-Type -AssemblyName PresentationFramework
    }
    [Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12
    if($tenantId)
    {
        Write-Host "Using Tenant Id: $tenantId"
        $global:AzureAppId = $appId 
        $global:ClientSecret = $secret 
        $global:ClientCert = $certificate
        $global:UseGraphEnvironment = $GraphEnvironment
        $global:UseGCCType = $GCCType
        if($global:AzureAppId)
        {
            Write-Host "Using Azure App Id: $($global:AzureAppId)"
        }
        else
        {
            Write-Warning "Azure App Id is missing. Use -AppId <AppID> on the command line"
        }
        if($global:ClientSecret -or $global:ClientCert)
        {
            if($global:ClientSecret)
            {
                Write-Host "Using Azure App Secret"
            }
            else
            {
                Write-Host "Using Azure App Certificate"
            }            
        }
        else
        {
            Write-Warning "Azure App Secret or Certificate is missing. Use -Secret <Secret> or -Certificate <Certificate> on the command line"
        }
        if($global:UseGraphEnvironment)
        {
            Write-Host "Using Azure Graph Environment: $($global:UseGraphEnvironment)"
        }
        if($global:UseGCCType)
        {
            Write-Host "Using Graph Environment type: $($global:UseGCCType)"
        }
    }
    if($global:hideUI -ne $true)
    {                
        # Run with UI
        try 
        {
            [xml]$xaml = Get-Content ([IO.Path]::GetDirectoryName($PSCommandPath) + "\Xaml\SplashScreen.xaml")
            $global:SplashScreen = ([Windows.Markup.XamlReader]::Load((New-Object System.Xml.XmlNodeReader $xaml)))
            $global:txtSplashTitle = $global:SplashScreen.FindName("txtSplashTitle")
            $global:txtSplashText = $global:SplashScreen.FindName("txtSplashText")
            $global:txtSplashTitle.Text = ("Initializing Cloud API PowerShell Management")
            $global:SplashScreen.Show() | Out-Null
            Invoke-AppDoEvents
        }
        catch 
        {
        }
    }
    else
    {
        # Run silent
        if(-not $tenantId)
        {
            # Core module not loaded yet so can't use log function
            Write-Error "Tenant Id is missing. Use -TenantId <Tenant-guid> on the command line to run silent batch jobs"
            return
        }
    }
    $global:TenantId = $tenantId
    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"
    } 
    Invoke-AppDoEvents
    Unblock-AllFiles $PSScriptRoot
    if($global:hideUI -ne $true)
    {
        $global:txtSplashText.Text = "Load core module"
    }
    Invoke-AppDoEvents
    Import-Module (Join-Path $PSScriptRoot "Core.psm1") -Force -Global
    Start-CoreApp $View
 }
--- a/Core.psm1
+++ b/Core.psm1
--- a/Documentation.md
+++ b/Documentation.md
@@ -1,150 +0,0 @@
 # Documentation
 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 than the portal.
 The objects can be documented in three ways:
 * One or more objects of a single object type
  Document one or more objects by selecting them and click the Documentation button 
 * Selected objects of multiple object types
  Add objects via the Documentation button, Add to list and then document all selected objects via the Bulk menu
 * All objects
  Document all supported objects. Initiated in the Bulk menu 
 Documentation is a very complex process. There are multiple types of objects, different languages, different types of properties etc. The best output is often based on a personal opinion. Some parts can be configured but not everything can be personalized. The output of most properties is simple, there is a name and a value. This is not the case for some properties e.g. a firewall rule. The firewall rule is itself a table with lots of possible values. The documentation will add the multi-property values with a property separator, comma is the default setting. There are also properties that contains multiple values. These will be added with an object separator, new line as default. The separators can be changed e.g. it might be better to use | as a object separator when documenting to a CSV.  
 **Note:** The word document might need some manual post updates. Tables are auto generated but they might have to be tweaked for personal preferences.      
 Please read the [Deep Dive](#deep-dive) section below for a detailed description of the documentation process.
 **Language Support**
 The script can document the objects in any language supported by Intune. 
 Note that some profiles and properties do not have language support. These will be documented in English.
 **Known Issues**
 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.
 * Some complex type properties are not translated in this version e.g. the screen layout of apps on the iPhone. 
 * The script will generate warning that properties are missing. This could be caused by multiple reasons
  * The property must be added to the custom documentation provider
    Note that one missing property can cause other properties from not being documented.
  * The property does not exist until it is configured e.g. privacy settings in the Win 10 Device Restrictions profile.
 * Property based profiles uses generated translation and static language files. These files needs to be generated and uploaded when new functionality is released in Intune
 * 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 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. 
 # Deep Dive
 The documentation is based on a two step process
 * Gather information about the object
  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 provider
  This will send all the information gathered about the object to the selected output provider
 These steps are then repeated for each object that is being documented.
 An output provider then has an initial (PreProcess) and finish (PostProcess) step e.g. the Word provider will create a word document in the initial task, document all properties and then update content tables, word properties and save the document in the finish task.
 **Object Types**
 Intune has multiple object types, over 100 different profile/policy types. These could be objects based on a static set of properties e.g. Configuration Profiles, Compliance Policies etc. or it could be settings based objects like Settings Catalog, Endpoint Security policies and Administrative Templates. The settings based policies only store information about the configured settings and not all settings available for the object. 
 **Settings Based Objects**
 All the documentation for Settings objects is done via Microsoft Graph. The Graph APIs contains all the information about property types, enum and language strings etc.  
 Language strings for column headers and basic information are documented from the static language files
 **Property Based Objects**
 Property based objects are very complex to document. These objects can be documented in different ways;
 * Generated json files
 * Manually created json files
 * 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 # are manually created. These can either be based on the object type (@OData.Type) or the Object Type Id (specified in the EndpointManager.psm1 file). Files that does not start with a # are automatically generated and the `ObjectCategories.json` file contains the mapping between the Intune object and associated json files. One object type can be associated with multiple files. Each file represents one category of the object.
 The generated files sometimes requires additional manually created properties. These could be properties in the UI that has a Yes/No, Enabled/Not Configured etc. trigger associated with a specific value. These properties must be manually added to the object before the documentation. The `DocumentationCustom.psm1` file takes care of this. This file is also used for overriding the documentation of specific values and other custom required processing.    
 The json files contains a definition of each property to document. This includes information like type e.g. Boolean (Yes/No, Allow/Block, Enabled/Disabled etc.), Options, DataTable etc. The script will use these files to translate each property into a PSCustomObject that is then used by the output provider. The functionality of these files has been extended to enhance the documentation options for the manually created files. Data types of 100 or above is custom functionality. All data types below 100 is based on the same functionality as in the Intune portal. The data type engine in the script is created based on best effort of the generated json files. 
 The `DocumentationCustom.psm1` file also takes care of custom documentation for some object types e.g. Conditional Access. App Configuration policies etc. These objects are documented via a PowerShell function in the script.
 **Language Support**
 The Settings based objects get their language strings from Graph APIs with a few 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.
 These files will have to be re-generated when new functionality is released in Intune.
 **Scripts for Generated Files**
 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
 The documentation can be extended in multiple ways.
 * Documentation Provider
 * Documentation Output Provider
 The two methods can be used to customize the documentation in every possible way e.g. an Excel provider can easily be created to support excel as an output type,  a PowerShell module can be created to translate any unsupported property.
 The priority order for object documentation is:
 * Script function in the documentation provider module
 * Json file based on OData.Type
 * Json file based on Object Type
 * Generated json files 
 * Settings Objects
 **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 PowerShell functions.
 Documentation providers have a Priority property. This defines in what order the providers will be triggered. The provider with the lowest priority number will be executed first. The included custom documentation provider has a priority number of 1000. The information gathering of the provider can be overridden by creating a custom documentation provider with a lower priority number.
 **Documentation Output Provider**
 Once the script has finished gathering all the data of an object, it sends it to the Documentation Output provider.  This will then document it to the specific output type of the provider. Word and CSV are included. There is also a "None" provider included. This will only add the gathered information in the UI. This is used for quick information or when building the translation files. This is also used by the comparison functionality.
 The `DocumentationWord.psm1` and `DocumentationWordOptions.xaml` files are example on how to create an output provider. The xaml file contains the configuration options in the UI. The psm1 file registers the provider and builds the Word document based on the gathered information.
 **Translation Files**
 Translation files can be created for objects that don't support documentation at the moment. Some of them would require a combination of a json file and adding additional properties via PowerShell. The files are read when the documentation is triggered so they can be updated and tested without restarting the script.
 Do **NOT** update the generated files. These are automatically generated and will be reversed in every release.  
--- a/Documentation/AppTypes.json
+++ b/Documentation/AppTypes.json
@@ -1,260 +0,0 @@
 [
    {
        "AppType":  "AndroidLobApp",
        "ODataType":  "#microsoft.graph.androidLobApp",
        "Condition":  null,
        "LanguageId":  "androidLobApp"
    },
    {
        "AppType":  "AndroidStoreApp",
        "ODataType":  "#microsoft.graph.androidStoreApp",
        "Condition":  null,
        "LanguageId":  "androidStoreApp"
    },
    {
        "AppType":  "IosLobApp",
        "ODataType":  "#microsoft.graph.iosLobApp",
        "Condition":  null,
        "LanguageId":  "iosLobApp"
    },
    {
        "AppType":  "IosStoreApp",
        "ODataType":  "#microsoft.graph.iosStoreApp",
        "Condition":  null,
        "LanguageId":  "iosStoreApp"
    },
    {
        "AppType":  "IosVppApp",
        "ODataType":  "#microsoft.graph.iosVppApp",
        "Condition":  null,
        "LanguageId":  "iosVppApp"
    },
    {
        "AppType":  "WinGetPublicApp",
        "ODataType":  "#microsoft.graph.winGetApp",
        "Condition":  null,
        "LanguageId":  "winGetPublicApp"
    },
    {
        "AppType":  "WinGetStoreApp",
        "ODataType":  "#microsoft.graph.winGetApp",
        "Condition":  null,
        "LanguageId":  "winGetStoreApp"
    },
    {
        "AppType":  "MacOSLobApp",
        "ODataType":  "#microsoft.graph.macOSLobApp",
        "Condition":  null,
        "LanguageId":  "macOSLobApp"
    },
    {
        "AppType":  "MacOSMicrosoftEdgeApp",
        "ODataType":  "#microsoft.graph.macOSMicrosoftEdgeApp",
        "Condition":  null,
        "LanguageId":  "macOSEdgeApp"
    },
    {
        "AppType":  "MacOSMicrosoftDefenderApp",
        "ODataType":  "#microsoft.graph.macOSMicrosoftDefenderApp",
        "Condition":  null,
        "LanguageId":  "macOSMicrosoftDefenderApp"
    },
    {
        "AppType":  "MacOSDmgApp",
        "ODataType":  "#microsoft.graph.macOSDmgApp",
        "Condition":  null,
        "LanguageId":  "macOSDmgApp"
    },
    {
        "AppType":  "MacOSPkgApp",
        "ODataType":  "#microsoft.graph.macOSPkgApp",
        "Condition":  null,
        "LanguageId":  "macOSPkgApp"
    },
    {
        "AppType":  "MacOsVppApp",
        "ODataType":  "#microsoft.graph.macOsVppApp",
        "Condition":  null,
        "LanguageId":  "macOsVppApp"
    },
    {
        "AppType":  "MacOSWebClip",
        "ODataType":  "#microsoft.graph.macOSWebClip",
        "Condition":  null,
        "LanguageId":  "macOSWebClip"
    },
    {
        "AppType":  "ManagedAndroidLobApp",
        "ODataType":  "#microsoft.graph.managedAndroidLobApp",
        "Condition":  null,
        "LanguageId":  "managedAndroidLobApp"
    },
    {
        "AppType":  "ManagedAndroidStoreApp",
        "ODataType":  "#microsoft.graph.managedAndroidStoreApp",
        "Condition":  {
                          "Property":  "appAvailability",
                          "Value":  "global"
                      },
        "LanguageId":  "managedAndroidStoreApp"
    },
    {
        "AppType":  "ManagedIosLobApp",
        "ODataType":  "#microsoft.graph.managedIOSLobApp",
        "Condition":  null,
        "LanguageId":  "managedIosLobApp"
    },
    {
        "AppType":  "ManagedIosStoreApp",
        "ODataType":  "#microsoft.graph.managedIOSStoreApp",
        "Condition":  {
                          "Property":  "appAvailability",
                          "Value":  "global"
                      },
        "LanguageId":  "managedIosStoreApp"
    },
    {
        "AppType":  "MicrosoftStoreForBusinessApp",
        "ODataType":  "#microsoft.graph.microsoftStoreForBusinessApp",
        "Condition":  null,
        "LanguageId":  "microsoftStoreForBusinessApp"
    },
    {
        "AppType":  "OfficeSuiteApp",
        "ODataType":  "#microsoft.graph.officeSuiteApp",
        "Condition":  null,
        "LanguageId":  "officeSuiteApp"
    },
    {
        "AppType":  "MacOSOfficeSuiteApp",
        "ODataType":  "#microsoft.graph.macOSOfficeSuiteApp",
        "Condition":  null,
        "LanguageId":  "macOSOfficeSuiteApp"
    },
    {
        "AppType":  "WebApp",
        "ODataType":  "#microsoft.graph.webApp",
        "Condition":  null,
        "LanguageId":  "webApp"
    },
    {
        "AppType":  "WindowsAppXLobApp",
        "ODataType":  "#microsoft.graph.windowsAppX",
        "Condition":  null,
        "LanguageId":  "windowsAppXLobApp"
    },
    {
        "AppType":  "WindowsMicrosoftEdgeApp",
        "ODataType":  "#microsoft.graph.windowsMicrosoftEdgeApp",
        "Condition":  null,
        "LanguageId":  "windowsEdgeApp"
    },
    {
        "AppType":  "WindowsMobileMsiLobApp",
        "ODataType":  "#microsoft.graph.windowsMobileMSI",
        "Condition":  null,
        "LanguageId":  "windowsMobileMsiLobApp"
    },
    {
        "AppType":  "WindowsPhone81AppXBundleLobApp",
        "ODataType":  "#microsoft.graph.windowsPhone81AppXBundle",
        "Condition":  null,
        "LanguageId":  "windowsPhone81AppXBundleLobApp"
    },
    {
        "AppType":  "WindowsPhone81AppXLobApp",
        "ODataType":  "#microsoft.graph.windowsPhone81AppX",
        "Condition":  null,
        "LanguageId":  "windowsPhone81AppXLobApp"
    },
    {
        "AppType":  "WindowsPhone81StoreApp",
        "ODataType":  "#microsoft.graph.windowsPhone81StoreApp",
        "Condition":  null,
        "LanguageId":  "windowsPhone81StoreApp"
    },
    {
        "AppType":  "WindowsPhoneXapLobApp",
        "ODataType":  "#microsoft.graph.windowsPhoneXAP",
        "Condition":  null,
        "LanguageId":  "windowsPhoneXapLobApp"
    },
    {
        "AppType":  "WindowsStoreApp",
        "ODataType":  "#microsoft.graph.windowsStoreApp",
        "Condition":  null,
        "LanguageId":  "windowsStoreApp"
    },
    {
        "AppType":  "WindowsClassicApp",
        "ODataType":  "#microsoft.graph.win32LobApp",
        "Condition":  null,
        "LanguageId":  "windowsClassicApp"
    },
    {
        "AppType":  "ManagedGooglePlayApp",
        "ODataType":  "#microsoft.graph.androidManagedStoreApp",
        "Condition":  {
                          "Property":  "isSystemApp",
                          "Value":  false
                      },
        "LanguageId":  "managedGooglePlayApp"
    },
    {
        "AppType":  "AndroidForWorkSystemApp",
        "ODataType":  "#microsoft.graph.androidManagedStoreApp",
        "Condition":  {
                          "Property":  "isSystemApp",
                          "Value":  true
                      },
        "LanguageId":  "androidEnterpriseSystemApp"
    },
    {
        "AppType":  "BuiltInAndroid",
        "ODataType":  "#microsoft.graph.managedAndroidStoreApp",
        "Condition":  {
                          "Property":  "appAvailability",
                          "Value":  "lineOfBusiness"
                      },
        "LanguageId":  "builtInAndroid"
    },
    {
        "AppType":  "BuiltInIos",
        "ODataType":  "#microsoft.graph.managedIOSStoreApp",
        "Condition":  {
                          "Property":  "appAvailability",
                          "Value":  "lineOfBusiness"
                      },
        "LanguageId":  "builtInIos"
    },
    {
        "AppType":  "IosIPadOSWebClip",
        "ODataType":  "#microsoft.graph.iOSiPadOSWebClip",
        "Condition":  null,
        "LanguageId":  "iosIPadOSWebClip"
    },
    {
        "AppType":  "WindowsWebApp",
        "ODataType":  "#microsoft.graph.windowsWebApp",
        "Condition":  null,
        "LanguageId":  "windowsWebApp"
    },
    {
        "AppType":  "Win32CatalogApp",
        "ODataType":  "#microsoft.graph.win32CatalogApp",
        "Condition":  null,
        "LanguageId":  "win32CatalogApp"
    },
    {
        "AppType":  "WindowsUniversalAppXLobApp",
        "ODataType":  "#microsoft.graph.windowsUniversalAppX",
        "Condition":  null,
        "LanguageId":  "windowsUniversalAppXLobApp"
    },
    {
        "AppType":  "WindowsUniversalMsiXLobApp",
        "ODataType":  "#microsoft.graph.windowsUniversalAppX",
        "Condition":  null,
        "LanguageId":  "windowsUniversalLobApp"
    }
 ]
--- a/Documentation/Category-en.json
+++ b/Documentation/Category-en.json
@@ -1,149 +0,0 @@
 {
    "airPlay":  "AirPlay",
    "airPrint":  "AirPrint",
    "androidDefenderAtp":  "Microsoft Defender for Endpoint",
    "androidDeviceOwnerApplications":  "Applications",
    "androidForWorkPassword":  "Device password",
    "appManagement":  "Allow or Block apps",
    "applicationGuard":  "Microsoft Defender Application Guard",
    "applicationRestrictions":  "Restricted Apps",
    "applicationVisibility":  "Show or Hide Apps",
    "applications":  "App Store",
    "applicationsAndGames":  "App Store, Doc Viewing, Gaming",
    "applicationsAndGoogle":  "Google Play Store",
    "appsAndExperience":  "Apps and experience",
    "associatedDomains":  "Associated domains",
    "autonomousSingleAppMode":  "Autonomous Single App Mode",
    "azureOperationalInsights":  "Azure operational insights",
    "bitLocker":  "Windows Encryption",
    "browser":  "Browser",
    "builtinApps":  "Built-in Apps",
    "cellular":  "Cellular",
    "cloudAndStorage":  "Cloud and Storage",
    "cloudPrint":  "Cloud Printer",
    "complianceEmailProfile":  "Email",
    "connectedDevices":  "Connected Devices",
    "connectivity":  "Cellular and connectivity",
    "contentCaching":  "Content caching",
    "controlPanelAndSettings":  "Control Panel and Settings",
    "credentialGuard":  "Microsoft Defender Credential Guard",
    "customCompliance":  "Custom Compliance",
    "customConfiguration":  "Custom Configuration Profile",
    "customOMASettings":  "Custom OMA-URI Settings",
    "customPreferences":  "Preference file",
    "defender":  "Microsoft Defender Antivirus",
    "defenderAntivirus":  "Microsoft Defender Antivirus",
    "defenderExploitGuard":  "Microsoft Defender Exploit Guard",
    "defenderFirewall":  "Microsoft Defender Firewall",
    "defenderLocalSecurityOptions":  "Local device security options",
    "defenderSecurityCenter":  "Microsoft Defender Security Center",
    "deliveryOptimization":  "Delivery Optimization",
    "derivedCredentialAuthenticationConfiguration":  "Derived credential",
    "deviceExperience":  "Device experience",
    "deviceFirmwareConfigurationInterface":  "Device Firmware Configuration Interface",
    "deviceGuard":  "Microsoft Defender Application Control",
    "deviceHealth":  "Device Health",
    "devicePassword":  "Device password",
    "deviceProperties":  "Device Properties",
    "deviceRestrictions":  "General",
    "deviceSecurity":  "System security",
    "display":  "Display",
    "domainJoin":  "Domain Join",
    "domains":  "Domains",
    "edgeBrowser":  "Microsoft Edge Legacy (Version 45 and earlier)",
    "edgeBrowserSmartScreen":  "Microsoft Defender SmartScreen",
    "edgeKiosk":  "Microsoft Edge kiosk mode",
    "editionUpgrade":  "Edition Upgrade",
    "education":  "Education",
    "educationDeviceCerts":  "Device certificates",
    "educationStudentCerts":  "Student certificates",
    "educationTakeATest":  "Take a Test",
    "educationTeacherCerts":  "Teacher certificates",
    "emailProfile":  "Email",
    "enterpriseDataProtection":  "Windows Information Protection",
    "expeditedCheckin":  "Mobile device management configuration",
    "extensibleSingleSignOn":  "Single sign-on app extension",
    "filevault":  "FileVault",
    "firewall":  "Firewall",
    "games":  "Games",
    "gatekeeper":  "Gatekeeper",
    "healthMonitoring":  "Health monitoring",
    "homeScreenLayout":  "Home Screen Layout",
    "iOSWallpaper":  "Wallpaper",
    "importedPFX":  "PKCS Imported Certificate",
    "iosDefenderAtp":  "Microsoft Defender for Endpoint",
    "iosKiosk":  "Kiosk",
    "kernelExtensions":  "Kernel extensions",
    "keyboardAndDictionary":  "Keyboard and Dictionary",
    "kiosk":  "Kiosk",
    "kioskAndroidEnterprise":  "Dedicated devices",
    "kioskConfiguration":  "Kiosk",
    "kioskConfigurationV2":  "Kiosk",
    "kioskWebBrowser":  "Kiosk web browser",
    "lockScreenMessage":  "Lock Screen Message",
    "lockedScreenExperience":  "Locked Screen Experience",
    "logging":  "Reporting and Telemetry",
    "loginItems":  "Login items",
    "loginWindow":  "Login window",
    "macDefenderAtp":  "Microsoft Defender for Endpoint",
    "maintenance":  "Maintenance",
    "malware":  "Malware",
    "messaging":  "Messaging",
    "networkBoundary":  "Network boundary",
    "networkProxy":  "Network proxy",
    "notifications":  "App Notifications",
    "pKCS":  "PKCS Certificate",
    "password":  "Password",
    "personalProfile":  "Personal profile",
    "personalization":  "Personalization",
    "policyOverride":  "Override Group Policy",
    "powerSettings":  "Power Settings",
    "printer":  "Printer",
    "privacy":  "Privacy",
    "privacyPerApp":  "Per-app privacy exceptions",
    "privacyPreferences":  "Privacy preferences",
    "projection":  "Projection",
    "sCCMCompliance":  "Configuration Manager Compliance",
    "sCEP":  "SCEP Certificate",
    "sCEPProperties":  "SCEP Certificate",
    "sMode":  "Mode switch (Windows Insider only)",
    "safari":  "Safari",
    "search":  "Search",
    "session":  "Session",
    "sharedDevice":  "Shared iPad",
    "sharedPCAccountManager":  "Shared multi-user device",
    "singleSignOn":  "Single Sign On",
    "smartScreen":  "Microsoft Defender SmartScreen",
    "softwareUpdates":  "Settings",
    "start":  "Start",
    "systemExtensions":  "System extensions",
    "systemSecurity":  "System Security",
    "trustedCert":  "Trusted Certificate",
    "updates":  "Updates",
    "userRights":  "User Rights",
    "usersAndAccounts":  "Users and Accounts",
    "vPN":  "Base VPN",
    "vPNApps":  "Automatic VPN",
    "vPNAppsAndTrafficRules":  "Apps and Traffic Rules",
    "vPNConditionalAccess":  "Conditional Access",
    "vPNConnectivity":  "Connectivity",
    "vPNDNSTriggers":  "DNS Settings",
    "vPNIKEv2":  "IKEv2 settings",
    "vPNProxy":  "Proxy",
    "vPNSplitTunneling":  "Split Tunneling",
    "vPNTrustedNetwork":  "Trusted Network Detection",
    "webContentFilter":  "Web Content Filter",
    "wiFi":  "Wi-Fi",
    "win10Wifi":  "Wi-Fi",
    "windowsAtp":  "Microsoft Defender for Endpoint",
    "windowsDefenderATP":  "Microsoft Defender for Endpoint",
    "windowsHelloForBusiness":  "Windows Hello for Business",
    "windowsSpotlight":  "Windows Spotlight",
    "wiredNetwork":  "Wired network",
    "wireless":  "Wireless",
    "wirelessProjection":  "Wireless projection",
    "workProfile":  "Work profile settings",
    "workProfilePassword":  "Work profile password",
    "xboxServices":  "Xbox services",
    "zebraMx":  "MX profile (Zebra only)"
 }
--- a/Documentation/CategoryId.json
+++ b/Documentation/CategoryId.json
@@ -1,156 +0,0 @@
 {
    "0":  "AirPlay",
    "1":  "AirPrint",
    "2":  "AndroidDeviceOwnerApplications",
    "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"
 }
--- a/Documentation/DefaultHTMLStyle.css
+++ b/Documentation/DefaultHTMLStyle.css
@@ -1,184 +0,0 @@
 <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>
--- a/Documentation/DefaultMDStyle.css
+++ b/Documentation/DefaultMDStyle.css
@@ -1,117 +0,0 @@
 <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>
--- a/Documentation/Languages.json
+++ b/Documentation/Languages.json
@@ -1,122 +0,0 @@
 [
    {
        "Name":  "en",
        "EnglishName":  "English",
        "NativeName":  "English‎",
        "FullName":  "en-us"
    }, 
    {
        "Name":  "de",
        "EnglishName":  "German",
        "NativeName":  "Deutsch‎",
        "FullName":  "de-de"
    },
    {
        "Name":  "es",
        "EnglishName":  "Spanish",
        "NativeName":  "Español‎",
        "FullName":  "es-es"
    },
    {
        "Name":  "fr",
        "EnglishName":  "French",
        "NativeName":  "Français‎",
        "FullName":  "fr-fr"
    },
    {
        "Name":  "it",
        "EnglishName":  "Italian",
        "NativeName":  "Italiano‎",
        "FullName":  "it-it"
    },
    {
        "Name":  "hu",
        "EnglishName":  "Hungarian",
        "NativeName":  "Magyar‎",
        "FullName":  "hu-hu"
    },
    {
        "Name":  "nl",
        "EnglishName":  "Dutch",
        "NativeName":  "Nederlands‎",
        "FullName":  "nl-nl"
    },
    {
        "Name":  "pl",
        "EnglishName":  "Polish",
        "NativeName":  "Polski‎",
        "FullName":  "pl-pl"
    },
    {
        "Name":  "pt",
        "EnglishName":  "Portuguese",
        "NativeName":  "Português‎",
        "FullName":  "pt-br"
    },
    {
        "Name":  "sv",
        "EnglishName":  "Swedish",
        "NativeName":  "Svenska‎",
        "FullName":  "sv-se"
    },
    {
        "Name":  "tr",
        "EnglishName":  "Turkish",
        "NativeName":  "Türkçe‎",
        "FullName":  "tr-tr"
    },
    {
        "Name":  "cs",
        "EnglishName":  "Czech",
        "NativeName":  "Čeština‎",
        "FullName":  "cs-cz"
    },
    {
        "Name":  "ru",
        "EnglishName":  "Russian",
        "NativeName":  "Русский‎",
        "FullName":  "ru-ru"
    },
    {
        "Name":  "zh",
        "EnglishName":  "Chinese",
        "NativeName":  "中文‎",
        "FullName":  "zh-cn"
    },
    {
        "Name":  "zh-hans",
        "EnglishName":  "Chinese (Simplified)",
        "NativeName":  "中文(简体)‎",
        "FullName":  "zh-cn"
    },
    {
        "Name":  "zh-chs",
        "EnglishName":  "Chinese (Simplified) Legacy",
        "NativeName":  "中文(简体) 旧版‎",
        "FullName":  "zh-cn"
    },
    {
        "Name":  "zh-hant",
        "EnglishName":  "Chinese (Traditional)",
        "NativeName":  "中文(繁體)‎",
        "FullName":  "zh-tw"
    },
    {
        "Name":  "zh-cht",
        "EnglishName":  "Chinese (Traditional) Legacy",
        "NativeName":  "中文(繁體) 舊版‎",
        "FullName":  "zh-tw"
    },
    {
        "Name":  "ja",
        "EnglishName":  "Japanese",
        "NativeName":  "日本語‎",
        "FullName":  "ja-jp"
    },
    {
        "Name":  "ko",
        "EnglishName":  "Korean",
        "NativeName":  "한국어‎",
        "FullName":  "ko-kr"
    }
 ]
--- a/Documentation/ObjectCategories.json
+++ b/Documentation/ObjectCategories.json
--- a/Documentation/ObjectInfo/#AppConfigEdgeApp.json
+++ b/Documentation/ObjectInfo/#AppConfigEdgeApp.json
@@ -1,56 +0,0 @@
 [
    {
        "nameResourceKey":  "applicationConfiguration",
        "descriptionResourceKey":  "",
        "dataType":  8,
        "booleanActions":  0
    },
    {
        "nameResourceKey":  "EdgeAppConfig.ApplicationProxyRedirection.title",
        "descriptionResourceKey":  "",
        "entityKey":  "com.microsoft.intune.mam.managedbrowser.AppProxyRedirection",
        "dataType":  0,
        "booleanActions":  102,
        "category": "TACSettings.edgeSettings"
    },
    {
        "nameResourceKey":  "EdgeAppConfig.HomepageURL.title",
        "descriptionResourceKey":  "",
        "entityKey":  "com.microsoft.intune.mam.managedbrowser.homepage",
        "dataType":  20,
        "booleanActions":  0,
        "category": "TACSettings.edgeSettings"
    },
    {
        "nameResourceKey":  "EdgeAppConfig.Bookmarks.header",
        "descriptionResourceKey":  "",
        "entityKey":  "com.microsoft.intune.mam.managedbrowser.bookmarks",
        "dataType":  20,
        "booleanActions":  0,
        "category": "TACSettings.edgeSettings"
    },
    {
        "nameResourceKey":  "EdgeAppConfig.AllowedURLs.title",
        "descriptionResourceKey":  "",
        "entityKey":  "com.microsoft.intune.mam.managedbrowser.AllowListURLs",
        "dataType":  20,
        "booleanActions":  0,
        "category": "TACSettings.edgeSettings"
    },
    {
        "nameResourceKey":  "EdgeAppConfig.BlockedURLs.title",
        "descriptionResourceKey":  "",
        "entityKey":  "com.microsoft.intune.mam.managedbrowser.BlockListURLs",
        "dataType":  20,
        "booleanActions":  0,
        "category": "TACSettings.edgeSettings"
    },
    {
        "nameResourceKey":  "EdgeAppConfig.PersonalContext.label",
        "descriptionResourceKey":  "",
        "entityKey":  "com.microsoft.intune.mam.managedbrowser.AllowTransitionOnBlock",
        "dataType":  0,
        "booleanActions":  102,
        "category": "TACSettings.edgeSettings"
    }
 ]
--- a/Documentation/ObjectInfo/#AppConfigOutlookApp.json
+++ b/Documentation/ObjectInfo/#AppConfigOutlookApp.json
@@ -1,444 +0,0 @@
 [
    {
        "nameResourceKey":  "applicationConfiguration",
        "descriptionResourceKey":  "",
        "dataType":  8,
        "booleanActions":  0
    },
    {
        "nameResourceKey":  "OutlookAppConfig.allowFocusedInboxTitle",
        "descriptionResourceKey":  "",
        "entityKey":  "com.microsoft.outlook.Mail.FocusedInbox",
        "dataType":  0,
        "booleanActions":  109,
        "category": "TACSettings.outlookSettings"
    },
    {
        "nameResourceKey":  "OutlookAppConfig.allowBiometricsTitle",
        "descriptionResourceKey":  "",
        "entityKey":  "com.microsoft.outlook.Auth.Biometric",
        "dataType":  0,
        "booleanActions":  109,
        "category": "TACSettings.outlookSettings"
    },
    {
        "nameResourceKey":  "OutlookAppConfig.allowUserChangeTitle",
        "descriptionResourceKey":  "",
        "entityKey":  "com.microsoft.outlook.Auth.Biometric.UserChangeAllowed",
        "dataType":  0,
        "booleanActions":  109,
        "unconfiguredValue": true,
        "allowMissing": true,
        "category": "TACSettings.outlookSettings",
        "Condition": {
            "Expressions": [
                {
                    "property": "com.microsoft.outlook.Auth.Biometric",
                    "value": "true"
                }
            ]
        }        
    },
    {
        "nameResourceKey":  "OutlookAppConfig.allowSaveContactsTitle",
        "descriptionResourceKey":  "",
        "entityKey":  "com.microsoft.outlook.Contacts.LocalSyncEnabled",
        "dataType":  0,
        "booleanActions":  109,
        "category": "TACSettings.outlookSettings"
    },
    {
        "nameResourceKey":  "OutlookAppConfig.allowUserChangeTitle",
        "descriptionResourceKey":  "",
        "entityKey":  "com.microsoft.outlook.Contacts.LocalSyncEnabled.UserChangeAllowed",
        "dataType":  0,
        "booleanActions":  109,
        "unconfiguredValue": true,
        "allowMissing": true,
        "category": "TACSettings.outlookSettings",
        "Condition": {
            "Expressions": [
                {
                    "property": "com.microsoft.outlook.Contacts.LocalSyncEnabled",
                    "value": "true"
                }
            ]
        }        
    },
    {
        "nameResourceKey":  "OutlookAppConfig.allowExternalRecipientsMailTipTitle",
        "descriptionResourceKey":  "",
        "entityKey":  "com.microsoft.outlook.Mail.ExternalRecipientsToolTipEnabled",
        "dataType":  0,
        "booleanActions":  109,
        "category": "TACSettings.outlookSettings"
    },
    {
        "nameResourceKey":  "OutlookAppConfig.blockExternalImagesTitle",
        "descriptionResourceKey":  "",
        "entityKey":  "com.microsoft.outlook.Mail.BlockExternalImagesEnabled",
        "dataType":  0,
        "booleanActions":  109,
        "category": "TACSettings.outlookSettings"
    },
    {
        "nameResourceKey":  "OutlookAppConfig.allowUserChangeTitle",
        "descriptionResourceKey":  "",
        "entityKey":  "com.microsoft.outlook.Mail.BlockExternalImagesEnabled.UserChangeAllowed",
        "dataType":  0,
        "booleanActions":  109,
        "unconfiguredValue": true,
        "allowMissing": true,
        "category": "TACSettings.outlookSettings",
        "Condition": {
            "Expressions": [
                {
                    "property": "com.microsoft.outlook.Mail.BlockExternalImagesEnabled",
                    "value": "true"
                }
            ]
        }        
    },
    {
        "nameResourceKey":  "OutlookAppConfig.allowDefaultAppSignatureTitle",
        "descriptionResourceKey":  "",
        "entityKey":  "com.microsoft.outlook.Mail.DefaultSignatureEnabled",
        "dataType":  0,
        "booleanActions":  109,
        "category": "TACSettings.outlookSettings"
    },
    {
        "nameResourceKey":  "OutlookAppConfig.allowSmartReplyTitle",
        "descriptionResourceKey":  "",
        "entityKey":  "com.microsoft.outlook.Mail.SuggestedRepliesEnabled",
        "dataType":  0,
        "booleanActions":  109,
        "category": "TACSettings.outlookSettings"
    },
    {
        "nameResourceKey":  "OutlookAppConfig.allowUserChangeTitle",
        "descriptionResourceKey":  "",
        "entityKey":  "com.microsoft.outlook.Mail.SuggestedRepliesEnabled.UserChangeAllowed",
        "dataType":  0,
        "booleanActions":  109,
        "category": "TACSettings.outlookSettings",
        "unconfiguredValue": true,
        "allowMissing": true,
        "Condition": {
            "Expressions": [
                {
                    "property": "com.microsoft.outlook.Mail.SuggestedRepliesEnabled",
                    "value": "true"
                }
            ]
        }        
    },
    {
        "nameResourceKey":  "OutlookAppConfig.OrganizeMailByThread.title",
        "descriptionResourceKey":  "",
        "entityKey":  "com.microsoft.outlook.Mail.OrganizeByThreadEnabled",
        "dataType":  0,
        "booleanActions":  109,
        "category": "TACSettings.outlookSettings"
    },
    {
        "nameResourceKey":  "OutlookAppConfig.discoverFeedTitle",
        "descriptionResourceKey":  "",
        "entityKey":  "com.microsoft.outlook.Mail.officeFeedEnabled",
        "dataType":  0,
        "booleanActions":  120,
        "category": "TACSettings.outlookSettings"        
    },
    {
        "nameResourceKey":  "OutlookAppConfig.playMyEmailsTitle",
        "descriptionResourceKey":  "",
        "entityKey":  "com.microsoft.outlook.Mail.PlayMyEmailsEnabled",
        "dataType":  0,
        "booleanActions":  120,
        "category": "TACSettings.outlookSettings"
    },
    {
        "nameResourceKey":  "OutlookAppConfig.nativeCalendarSyncTitle",
        "descriptionResourceKey":  "",
        "entityKey":  "com.microsoft.outlook.Calendar.NativeSyncEnabled",
        "dataType":  0,
        "booleanActions":  120,
        "category": "TACSettings.outlookSettings"
    },
    {
        "nameResourceKey":  "OutlookAppConfig.allowUserChangeTitle",
        "descriptionResourceKey":  "",
        "entityKey":  "com.microsoft.outlook.Calendar.NativeSyncEnabled.UserChangeAllowed",
        "dataType":  0,
        "booleanActions":  109,
        "unconfiguredValue": true,
        "allowMissing": true,
        "category": "TACSettings.outlookSettings",
        "Condition": {
            "Expressions": [
                {
                    "property": "com.microsoft.outlook.Calendar.NativeSyncEnabled",
                    "value": "true"
                }
            ]
        }        
    },
    {
        "nameResourceKey":  "OutlookAppConfig.textPredictionsTitle",
        "descriptionResourceKey":  "",
        "entityKey":  "com.microsoft.outlook.Mail.TextPredictionsEnabled",
        "dataType":  0,
        "booleanActions":  120,
        "category": "TACSettings.outlookSettings"
    },
    {
        "nameResourceKey":  "OutlookAppConfig.allowUserChangeTitle",
        "descriptionResourceKey":  "",
        "entityKey":  "com.microsoft.outlook.Mail.TextPredictionsEnabled.UserChangeAllowed",
        "dataType":  0,
        "booleanActions":  109,
        "unconfiguredValue": true,
        "allowMissing": true,
        "category": "TACSettings.outlookSettings",
        "Condition": {
            "Expressions": [
                {
                    "property": "com.microsoft.outlook.Mail.TextPredictionsEnabled",
                    "value": "true"
                }
            ]
        }        
    },
    {
        "nameResourceKey":  "OutlookAppConfig.DataProtectionConfiguration.header",
        "descriptionResourceKey":  "",
        "dataType":  8,
        "booleanActions":  0
    },
    {
        "nameResourceKey":  "OutlookAppConfig.allowOrgDataOnWearablesTitle",
        "descriptionResourceKey":  "",
        "entityKey":  "com.microsoft.intune.mam.areWearablesAllowed",
        "dataType":  0,
        "booleanActions":  109,
        "category": "TACSettings.outlookSettings"
    },
    {
        "nameResourceKey":  "OutlookAppConfig.allowCalendarNotificationsTitle",
        "descriptionResourceKey":  "",
        "entityKey":  "com.microsoft.outlook.Calendar.Notifications.IntuneMAMOnly",
        "dataType":  16,
        "booleanActions":  0,
        "category": "TACSettings.outlookSettings",
        "options":  [    
            {
                "nameResourceKey":  "BooleanActions.notConfigured",
                "value":  "false"
            },
            {
                "nameResourceKey":  "allowedOption",
                "value":  "0"
            }
        ]
    },
    {
        "nameResourceKey":  "OutlookAppConfig.nativeCalendarSyncMAMOnlyTitle",
        "descriptionResourceKey":  "",
        "entityKey":  "com.microsoft.outlook.Calendar.NativeSyncAvailable.IntuneMAMOnly",
        "dataType":  0,
        "booleanActions":  120,
        "category": "TACSettings.outlookSettings"
    },
    {
        "nameResourceKey":  "OutlookAppConfig.Sync.header",
        "descriptionResourceKey":  "",
        "dataType":  8,
        "booleanActions":  0
    },
    {
        "nameResourceKey":  "OutlookAppConfig.syncAddressTitle",
        "descriptionResourceKey":  "",
        "entityKey":  "com.microsoft.outlook.ContactSync.AddressAllowed",
        "dataType":  0,
        "booleanActions":  109,
        "category": "TACSettings.outlookSettings"
    },
    {
        "nameResourceKey":  "OutlookAppConfig.syncBirthdayTitle",
        "descriptionResourceKey":  "",
        "entityKey":  "com.microsoft.outlook.ContactSync.BirthdayAllowed",
        "dataType":  0,
        "booleanActions":  109,
        "category": "TACSettings.outlookSettings"
    },
    {
        "nameResourceKey":  "OutlookAppConfig.syncCompanyTitle",
        "descriptionResourceKey":  "",
        "entityKey":  "com.microsoft.outlook.ContactSync.CompanyAllowed",
        "dataType":  0,
        "booleanActions":  109,
        "category": "TACSettings.outlookSettings"
    },
    {
        "nameResourceKey":  "OutlookAppConfig.syncDepartmentTitle",
        "descriptionResourceKey":  "",
        "entityKey":  "com.microsoft.outlook.ContactSync.DepartmentAllowed",
        "dataType":  0,
        "booleanActions":  109,
        "category": "TACSettings.outlookSettings"
    },
    {
        "nameResourceKey":  "OutlookAppConfig.syncEmailAddressTitle",
        "descriptionResourceKey":  "",
        "entityKey":  "com.microsoft.outlook.ContactSync.EmailAllowed",
        "dataType":  0,
        "booleanActions":  109,
        "category": "TACSettings.outlookSettings"
    },
    {
        "nameResourceKey":  "OutlookAppConfig.syncInstantMessagingAddressTitle",
        "descriptionResourceKey":  "",
        "entityKey":  "com.microsoft.outlook.ContactSync.InstantMessageAllowed",
        "dataType":  0,
        "booleanActions":  109,
        "category": "TACSettings.outlookSettings"
    },
    {
        "nameResourceKey":  "OutlookAppConfig.syncJobTitleTitle",
        "descriptionResourceKey":  "",
        "entityKey":  "com.microsoft.outlook.ContactSync.JobTitleAllowed",
        "dataType":  0,
        "booleanActions":  109,
        "category": "TACSettings.outlookSettings"
    },
    {
        "nameResourceKey":  "OutlookAppConfig.syncPrefixTitle",
        "descriptionResourceKey":  "",
        "entityKey":  "com.microsoft.outlook.ContactSync.PrefixAllowed",
        "dataType":  0,
        "booleanActions":  109,
        "category": "TACSettings.outlookSettings"
    },
    {
        "nameResourceKey":  "OutlookAppConfig.syncSuffixTitle",
        "descriptionResourceKey":  "",
        "entityKey":  "com.microsoft.outlook.ContactSync.SuffixAllowed",
        "dataType":  0,
        "booleanActions":  109,
        "category": "TACSettings.outlookSettings"
    },
    {
        "nameResourceKey":  "OutlookAppConfig.syncNicknameTitle",
        "descriptionResourceKey":  "",
        "entityKey":  "com.microsoft.outlook.ContactSync.NicknameAllowed",
        "dataType":  0,
        "booleanActions":  109,
        "category": "TACSettings.outlookSettings"
    },
    {
        "nameResourceKey":  "OutlookAppConfig.syncNotesTitle",
        "descriptionResourceKey":  "",
        "entityKey":  "com.microsoft.outlook.ContactSync.NotesAllowed",
        "dataType":  0,
        "booleanActions":  109,
        "category": "TACSettings.outlookSettings"
    },
    {
        "nameResourceKey":  "OutlookAppConfig.syncPhoneHomeNumberTitle",
        "descriptionResourceKey":  "",
        "entityKey":  "com.microsoft.outlook.ContactSync.PhoneHomeAllowed",
        "dataType":  0,
        "booleanActions":  109,
        "category": "TACSettings.outlookSettings"
    },
    {
        "nameResourceKey":  "OutlookAppConfig.syncPhoneHomeFaxNumberTitle",
        "descriptionResourceKey":  "",
        "entityKey":  "com.microsoft.outlook.ContactSync.PhoneHomeFaxAllowed",
        "dataType":  0,
        "booleanActions":  109,
        "category": "TACSettings.outlookSettings"
    },
    {
        "nameResourceKey":  "OutlookAppConfig.syncPhoneMobileNumberTitle",
        "descriptionResourceKey":  "",
        "entityKey":  "com.microsoft.outlook.ContactSync.PhoneMobileAllowed",
        "dataType":  0,
        "booleanActions":  109,
        "category": "TACSettings.outlookSettings"
    },
    {
        "nameResourceKey":  "OutlookAppConfig.syncPhoneOtherNumberTitle",
        "descriptionResourceKey":  "",
        "entityKey":  "com.microsoft.outlook.ContactSync.PhoneOtherAllowed",
        "dataType":  0,
        "booleanActions":  109,
        "category": "TACSettings.outlookSettings"
    },
    {
        "nameResourceKey":  "OutlookAppConfig.syncPhonePagerNumberTitle",
        "descriptionResourceKey":  "",
        "entityKey":  "com.microsoft.outlook.ContactSync.PhonePagerAllowed",
        "dataType":  0,
        "booleanActions":  109,
        "category": "TACSettings.outlookSettings"
    },
    {
        "nameResourceKey":  "OutlookAppConfig.syncPhoneWorkNumberTitle",
        "descriptionResourceKey":  "",
        "entityKey":  "com.microsoft.outlook.ContactSync.PhoneWorkAllowed",
        "dataType":  0,
        "booleanActions":  109,
        "category": "TACSettings.outlookSettings"
    },
    {
        "nameResourceKey":  "OutlookAppConfig.syncPhoneWorkFaxNumberTitle",
        "descriptionResourceKey":  "",
        "entityKey":  "com.microsoft.outlook.ContactSync.PhoneWorkFaxAllowed",
        "dataType":  0,
        "booleanActions":  109,
        "category": "TACSettings.outlookSettings"
    },
    {
        "nameResourceKey":  "Inputs.outlookSMimeSettings",
        "descriptionResourceKey":  "",
        "dataType":  8,
        "booleanActions":  0
    },    
    {
        "nameResourceKey":  "OutlookAppConfig.enableSMIMETitle",
        "descriptionResourceKey":  "",
        "entityKey":  "com.microsoft.outlook.Mail.SMIMEEnabled",
        "dataType":  0,
        "booleanActions":  120,
        "category": "SettingDetails.requireSMIME"
    },
    {
        "nameResourceKey":  "OutlookAppConfig.allowUserChangeTitle",
        "descriptionResourceKey":  "",
        "entityKey":  "com.microsoft.outlook.Mail.SMIMEEnabled.UserChangeAllowed",
        "dataType":  0,
        "booleanActions":  109,
        "unconfiguredValue": true,
        "allowMissing": true,
        "category": "SettingDetails.requireSMIME",
        "Condition": {
            "Expressions": [
                {
                    "property": "com.microsoft.outlook.Mail.SMIMEEnabled",
                    "value": "true"
                }
            ]
        }        
    }
 ]
--- a/Documentation/ObjectInfo/#AppConfigOutlookDevice.json
+++ b/Documentation/ObjectInfo/#AppConfigOutlookDevice.json
@@ -1,443 +0,0 @@
 [
    {
        "nameResourceKey":  "outlookConfigTitle",
        "descriptionResourceKey":  "",
        "dataType":  8,
        "booleanActions":  0
    },
    {
        "nameResourceKey":  "OutlookAppConfigSettings.ConfigureEmail.title",
        "descriptionResourceKey":  "",
        "entityKey":  "configureEmail",
        "dataType":  0,
        "booleanActions":  109,
        "category": "SettingDetails.configurationSettingsTitle"
    },
    {
        "nameResourceKey":  "Inputs.authenticationType",
        "descriptionResourceKey":  "",
        "entityKey":  "com.microsoft.outlook.EmailProfile.AccountType",
        "dataType":  16,
        "booleanActions":  0,
        "category": "SettingDetails.configurationSettingsTitle",
        "options":  [                                
            {
                "nameResourceKey":  "Inputs.basicAuth",
                "value":  "BasicAuth"
            },
            {
                "nameResourceKey":  "Inputs.modernAuth",
                "value":  "ModernAuth"
            }
        ]
    },
    {
        "nameResourceKey":  "userNameTypeName",
        "descriptionResourceKey":  "",
        "entityKey":  "com.microsoft.outlook.EmailProfile.EmailUPN",
        "dataType":  16,
        "booleanActions":  0,
        "category": "SettingDetails.configurationSettingsTitle",
        "options":  [                                
            {
                "nameResourceKey":  "userPrincipalNameOption",
                "value":  "{{userprincipalname}}"
            },
            {
                "nameResourceKey":  "Inputs.sAMAccountName",
                "value":  "{{onPremisesSamAccountName}}"
            },            {
                "nameResourceKey":  "primarySMTPAddressOption",
                "value":  "{{mail}}"
            }
        ]
    },
    {
        "nameResourceKey":  "Inputs.accountDomain",
        "descriptionResourceKey":  "",
        "entityKey":  "com.microsoft.outlook.EmailProfile.AccountDomain",
        "dataType":  20,
        "booleanActions":  0,
        "category": "SettingDetails.configurationSettingsTitle",
        "Condition": {
            "Expressions": [
                {
                    "property": "com.microsoft.outlook.EmailProfile.EmailUPN",
                    "value": "{{onPremisesSamAccountName}}"
                }
            ]
        } 
    },
    {
        "nameResourceKey":  "emailAddressTypeName",
        "descriptionResourceKey":  "",
        "entityKey":  "com.microsoft.outlook.EmailProfile.EmailAddress",
        "dataType":  16,
        "booleanActions":  0,
        "category": "SettingDetails.configurationSettingsTitle",
        "options":  [                                
            {
                "nameResourceKey":  "userPrincipalNameOption",
                "value":  "{{userprincipalname}}"
            },
            {
                "nameResourceKey":  "primarySMTPAddressOption",
                "value":  "{{mail}}"
            }
        ]
    },
    {
        "nameResourceKey":  "Inputs.emailServer",
        "descriptionResourceKey":  "",
        "entityKey":  "com.microsoft.outlook.EmailProfile.ServerHostName",
        "dataType":  20,
        "booleanActions":  0,
        "category": "SettingDetails.configurationSettingsTitle",
        "Condition": {
            "Expressions": [
                {
                    "property": "com.microsoft.outlook.EmailProfile.AccountType",
                    "value": "BasicAuth"
                }
            ]
        } 
    },
    {
        "nameResourceKey":  "Inputs.emailAccount",
        "descriptionResourceKey":  "",
        "entityKey":  "com.microsoft.outlook.EmailProfile.EmailAccountName",
        "dataType":  20,
        "booleanActions":  0,
        "category": "SettingDetails.configurationSettingsTitle",
        "Condition": {
            "Expressions": [
                {
                    "property": "com.microsoft.outlook.EmailProfile.AccountType",
                    "value": "BasicAuth"
                }
            ]
        } 
    },
    {
        "nameResourceKey":  "OutlookAppConfigSettings.AllowWorkAccounts.title",
        "descriptionResourceKey":  "",
        "entityKey":  "IntuneMAMAllowedAccountsOnly",
        "dataType":  16,
        "booleanActions":  0,
        "category": "SettingDetails.configurationSettingsTitle",
        "Condition": {
            "Expressions": [
                {
                    "property": "com.microsoft.outlook.EmailProfile.AccountType",
                    "value": "ModernAuth"
                }
            ]
        },
        "options":  [                                
            {
                "nameResourceKey":  "enabledOption",
                "value":  "Enabled"
            },
            {
                "nameResourceKey":  "disabledOption",
                "value":  "Disabled"
            }
        ]
    },
    {
        "nameResourceKey":  "applicationConfiguration",
        "descriptionResourceKey":  "",
        "dataType":  8,
        "booleanActions":  0
    },
    {
        "nameResourceKey":  "OutlookAppConfig.allowFocusedInboxTitle",
        "descriptionResourceKey":  "",
        "entityKey":  "com.microsoft.outlook.Mail.FocusedInbox",
        "dataType":  0,
        "booleanActions":  120,
        "category": "SettingDetails.configurationSettingsTitle"
    },
    {
        "nameResourceKey":  "OutlookAppConfig.allowBiometricsTitle",
        "descriptionResourceKey":  "",
        "entityKey":  "com.microsoft.outlook.Auth.Biometric",
        "dataType":  0,
        "booleanActions":  120,
        "category": "SettingDetails.configurationSettingsTitle",
        "ChildSettings": [
            {
                "nameResourceKey":  "OutlookAppConfig.allowUserChangeTitle",
                "descriptionResourceKey":  "",
                "entityKey":  "com.microsoft.outlook.Auth.Biometric.UserChangeAllowed",
                "dataType":  0,
                "booleanActions":  109,
                "allowMissing": true,
                "unconfiguredValue": true,
                "alwaysAddValue": true,
                "category": "SettingDetails.configurationSettingsTitle",
                "Condition": {
                    "Expressions": [
                        {
                            "property": "com.microsoft.outlook.Auth.Biometric",
                            "value": "true"
                        }
                    ]
                }
            }
        ]
    },
    {
        "nameResourceKey":  "OutlookAppConfig.allowSaveContactsTitle",
        "descriptionResourceKey":  "",
        "entityKey":  "com.microsoft.outlook.Contacts.LocalSyncEnabled",
        "dataType":  0,
        "booleanActions":  120,
        "category": "SettingDetails.configurationSettingsTitle",
        "ChildSettings": [
            {
                "nameResourceKey":  "OutlookAppConfig.allowUserChangeTitle",
                "descriptionResourceKey":  "",
                "entityKey":  "com.microsoft.outlook.Contacts.LocalSyncEnabled.UserChangeAllowed",
                "dataType":  0,
                "booleanActions":  109,
                "allowMissing": true,
                "unconfiguredValue": true,
                "alwaysAddValue": true,
                "category": "SettingDetails.configurationSettingsTitle",
                "Condition": {
                    "Expressions": [
                        {
                            "property": "com.microsoft.outlook.Contacts.LocalSyncEnabled",
                            "value": "true"
                        }
                    ]
                }
            }
        ]
    },
    {
        "nameResourceKey":  "OutlookAppConfig.discoverFeedTitle",
        "descriptionResourceKey":  "",
        "entityKey":  "com.microsoft.outlook.Mail.officeFeedEnabled",
        "dataType":  0,
        "booleanActions":  120,
        "category": "SettingDetails.configurationSettingsTitle"        
    },
    {
        "nameResourceKey":  "OutlookAppConfig.allowSmartReplyTitle",
        "descriptionResourceKey":  "",
        "entityKey":  "com.microsoft.outlook.Mail.SuggestedRepliesEnabled",
        "dataType":  0,
        "booleanActions":  120,
        "category": "SettingDetails.configurationSettingsTitle",
        "ChildSettings": [
            {
                "nameResourceKey":  "OutlookAppConfig.allowUserChangeTitle",
                "descriptionResourceKey":  "",
                "entityKey":  "com.microsoft.outlook.Mail.SuggestedRepliesEnabled.UserChangeAllowed",
                "dataType":  0,
                "booleanActions":  109,                
                "allowMissing": true,
                "unconfiguredValue": true,
                "alwaysAddValue": true,
                "category": "SettingDetails.configurationSettingsTitle",
                "Condition": {
                    "Expressions": [
                        {
                            "property": "com.microsoft.outlook.Mail.SuggestedRepliesEnabled",
                            "value": "true"
                        }
                    ]
                }
            }
        ]
    },
    {
        "nameResourceKey":  "OutlookAppConfig.allowExternalRecipientsMailTipTitle",
        "descriptionResourceKey":  "",
        "entityKey":  "com.microsoft.outlook.Mail.ExternalRecipientsToolTipEnabled",
        "dataType":  0,
        "booleanActions":  120,
        "category": "SettingDetails.configurationSettingsTitle"
    },
    {
        "nameResourceKey":  "OutlookAppConfig.allowDefaultAppSignatureTitle",
        "descriptionResourceKey":  "",
        "entityKey":  "com.microsoft.outlook.Mail.DefaultSignatureEnabled",
        "dataType":  0,
        "booleanActions":  120,
        "category": "SettingDetails.configurationSettingsTitle"
    },
    {
        "nameResourceKey":  "OutlookAppConfig.blockExternalImagesTitle",
        "descriptionResourceKey":  "",
        "entityKey":  "com.microsoft.outlook.Mail.BlockExternalImagesEnabled",
        "dataType":  0,
        "booleanActions":  120,
        "category": "SettingDetails.configurationSettingsTitle",
        "ChildSettings": [
            {
                "nameResourceKey":  "OutlookAppConfig.allowUserChangeTitle",
                "descriptionResourceKey":  "",
                "entityKey":  "com.microsoft.outlook.Mail.BlockExternalImagesEnabled.UserChangeAllowed",
                "dataType":  0,
                "booleanActions":  109,
                "allowMissing": true,
                "unconfiguredValue": true,
                "alwaysAddValue": true,
                "category": "SettingDetails.configurationSettingsTitle",
                "Condition": {
                    "Expressions": [
                        {
                            "property": "com.microsoft.outlook.Mail.BlockExternalImagesEnabled",
                            "value": "true"
                        }
                    ]
                }
            }
        ]
    },
    {
        "nameResourceKey":  "OutlookAppConfig.OrganizeMailByThread.title",
        "descriptionResourceKey":  "",
        "entityKey":  "com.microsoft.outlook.Mail.OrganizeByThreadEnabled",
        "dataType":  0,
        "booleanActions":  120,
        "category": "SettingDetails.configurationSettingsTitle"
    },
    {
        "nameResourceKey":  "OutlookAppConfig.playMyEmailsTitle",
        "descriptionResourceKey":  "",
        "entityKey":  "com.microsoft.outlook.Mail.PlayMyEmailsEnabled",
        "dataType":  0,
        "booleanActions":  120,
        "category": "SettingDetails.configurationSettingsTitle"
    },
    {
        "nameResourceKey":  "OutlookAppConfig.themesEnabledTitle",
        "descriptionResourceKey":  "",
        "entityKey":  "com.microsoft.outlook.Settings.ThemesEnabled",
        "dataType":  0,
        "booleanActions":  120,
        "category": "SettingDetails.configurationSettingsTitle"
    },
    {
        "nameResourceKey":  "OutlookAppConfig.textPredictionsTitle",
        "descriptionResourceKey":  "",
        "entityKey":  "com.microsoft.outlook.Mail.TextPredictionsEnabled",
        "dataType":  0,
        "booleanActions":  120,
        "category": "SettingDetails.configurationSettingsTitle",
        "ChildSettings": [
            {
                "nameResourceKey":  "OutlookAppConfig.allowUserChangeTitle",
                "descriptionResourceKey":  "",
                "entityKey":  "com.microsoft.outlook.Mail.TextPredictionsEnabled.UserChangeAllowed",
                "dataType":  0,
                "booleanActions":  109,
                "allowMissing": true,
                "unconfiguredValue": true,
                "alwaysAddValue": true,
                "category": "SettingDetails.configurationSettingsTitle",
                "Condition": {
                    "Expressions": [
                        {
                            "property": "com.microsoft.outlook.Mail.TextPredictionsEnabled",
                            "value": "true"
                        }
                    ]
                }            
            }
        ]
    },
    {
        "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"
    }
 ]
--- a/Documentation/ObjectInfo/#Applications.json
+++ b/Documentation/ObjectInfo/#Applications.json
--- a/Documentation/ObjectInfo/#AutoPilot.json
+++ b/Documentation/ObjectInfo/#AutoPilot.json
@@ -1,228 +0,0 @@
 [
    {
        "nameResourceKey":  "TableHeaders.configurationType",
        "descriptionResourceKey":  "",
        "entityKey":  "WindowsEnrollment.deploymentProfiles",
        "dataType":  200,
        "booleanActions":  0,
        "category": 1000
    },
    {
        "nameResourceKey":  "Autopilot.harvestDeviceId",
        "descriptionResourceKey":  "",
        "entityKey":  "extractHardwareHash",
        "dataType":  0,
        "booleanActions":  109,
        "category": 1000
    },
    {
        "nameResourceKey":  "Autopilot.deviceType",
        "descriptionResourceKey":  "",
        "entityKey":  "deviceType",
        "dataType":  16,
        "booleanActions":  0,
        "category": 1000,
        "options":  [                                
            {
                "nameResourceKey":  "Platform.windowsPC",
                "value":  "windowsPc"
            },
            {
                "nameResourceKey":  "Platform.surfaceHub2",
                "value":  "surfaceHub2"
            },  
            {
                "nameResourceKey":  "Platform.holoLens",
                "value":  "holoLens"
            }
        ]        
    },
    {
        "nameResourceKey":  "Autopilot.OOBE.title",
        "descriptionResourceKey":  "",
        "entityKey":  "outOfBoxExperienceSettings",
        "dataType":  6,
        "booleanActions":  0,
        "category": "Autopilot.OOBE.title",
        "complexOptions":  [
            {
                "nameResourceKey":  "Autopilot.OOBE.configureDevice",
                "descriptionResourceKey":  "",
                "dataType":  16,
                "category":  "Autopilot.OOBE.title",
                "entityKey":  "deviceUsageType",
                "booleanActions":  0,
                "options":  [                                
                                {
                                    "nameResourceKey":  "Autopilot.OOBE.endUserDevice",
                                    "value":  "singleUser"
                                },
                                {
                                    "nameResourceKey":  "Autopilot.OOBE.plugAndForgetDevice",
                                    "value":  "shared"
                                }
                ]
            },
            {
                "nameResourceKey":  "Autopilot.directoryServiceLabel",
                "descriptionResourceKey":  "",
                "dataType":  16,
                "entityKey":  "azureADJoinType",
                "category":  "Autopilot.OOBE.title",
                "booleanActions":  0,
                "options":  [                                
                                {
                                    "nameResourceKey":  "Autopilot.DirectoryService.activeDirectoryAD",
                                    "value":  "hybrid"
                                },
                                {
                                    "nameResourceKey":  "Autopilot.DirectoryService.azureAD",
                                    "value":  "azureAD"
                                }
                ]
            }
        ]
    },    
    {
        "nameResourceKey":  "Autopilot.OOBE.HybridAzureADSkipConnectivityCheck.label",
        "descriptionResourceKey":  "Autopilot.OOBE.HybridAzureADSkipConnectivityCheck.infoBalloon",
        "dataType":  0,
        "category":  "Autopilot.OOBE.title",
        "entityKey":  "hybridAzureADJoinSkipConnectivityCheck",
        "booleanActions":  109,
        "Condition": {
            "type": "or",
            "Expressions": [
                {
                    "property": "@OData.Type",
                    "value": "#microsoft.graph.activeDirectoryWindowsAutopilotDeploymentProfile"
                }
            ]
        }
    },
    {
        "nameResourceKey":  "Autopilot.OOBE.language",
        "descriptionResourceKey":  "",
        "dataType":  102,
        "category":  "Autopilot.OOBE.title",
        "entityKey":  "language",
        "booleanActions":  0,
        "ChildSettings": [
            {
                "nameResourceKey":  "Autopilot.OOBE.title",
                "descriptionResourceKey":  "",
                "entityKey":  "outOfBoxExperienceSettings",
                "dataType":  6,
                "booleanActions":  0,
                "category": "Autopilot.OOBE.title",
                "Condition": {
                    "Expressions": [
                        {
                            "property": "language",
                            "operator": "ne",
                            "value": "user-select"
                        }
                    ]
                },
                "complexOptions":  [
                    {
                        "nameResourceKey":  "Autopilot.OOBE.skipKeyboardSelection",
                        "descriptionResourceKey":  "Autopilot.OOBE.skipKeyboardSelectionInfo",
                        "entityKey":  "skipKeyboardSelectionPage",
                        "dataType":  0,
                        "booleanActions":  109,
                        "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",
                "entityKey":  "hideEULA",
                "dataType":  0,
                "booleanActions":  108,
                "category": "Autopilot.OOBE.title"
            },
            {
                "nameResourceKey":  "Autopilot.OOBE.privacySettings",
                "descriptionResourceKey":  "Autopilot.OOBE.privacySettingsInfo",
                "entityKey":  "hidePrivacySettings",
                "dataType":  0,
                "booleanActions":  108,
                "category": "Autopilot.OOBE.title"
            },    
            {
                "nameResourceKey":  "Autopilot.OOBE.hideEscapeLink",
                "descriptionResourceKey":  "Autopilot.OOBE.hideEscapeLinkInfo",
                "entityKey":  "hideEscapeLink",
                "dataType":  0,
                "booleanActions":  108,
                "category": "Autopilot.OOBE.title"
            },
            {
                "nameResourceKey":  "Autopilot.OOBE.accountType",
                "descriptionResourceKey":  "Autopilot.OOBE.accountTypeInfo",
                "dataType":  16,
                "category":  "Autopilot.OOBE.title",
                "entityKey":  "userType",
                "booleanActions":  0,
                "options":  [                                
                                {
                                    "nameResourceKey":  "standard",
                                    "value":  "standard"
                                },
                                {
                                    "nameResourceKey":  "admin",
                                    "value":  "administrator"
                                }
                ]
            }            
        ]
    },
    {
        "nameResourceKey":  "Autopilot.OOBE.EnableWhiteGlove.label",
        "descriptionResourceKey":  "Autopilot.OOBE.EnableWhiteGlove.infoBalloon",
        "entityKey":  "enableWhiteGlove",
        "dataType":  0,
        "booleanActions":  109,
        "category": "Autopilot.OOBE.title"
    },    
    {
        "nameResourceKey":  "Autopilot.OOBE.ApplyComputerNameTemplate.label",
        "descriptionResourceKey":  "Autopilot.OOBE.ApplyComputerNameTemplate.infoBalloon",
        "entityKey":  "applyDeviceNameTemplate",
        "dataType":  0,        
        "booleanActions":  109,
        "category": "Autopilot.OOBE.title",
        "ChildSettings": [
            {
                "nameResourceKey":  "Inputs.nameHint",
                "descriptionResourceKey":  "",
                "dataType":  20,
                "category":  "Autopilot.OOBE.title",
                "entityKey":  "deviceNameTemplate",
                "booleanActions":  0
            }
        ]
    }
 ]
--- a/Documentation/ObjectInfo/#microsoft.graph.androidManagedAppProtection.json
+++ b/Documentation/ObjectInfo/#microsoft.graph.androidManagedAppProtection.json
@@ -1,613 +0,0 @@
 [
    {
        "nameResourceKey":  "TableHeaders.policyType",
        "descriptionResourceKey":  "",
        "entityKey":  "SettingDetails.appProtectionPolicy",
        "dataType":  200,
        "booleanActions":  0,
        "category": 1000
    },
    {
        "nameResourceKey":  "SettingDetails.platformSupported",
        "descriptionResourceKey":  "",
        "entityKey":  "AppProtection.androidPlatformLabel",
        "dataType":  200,
        "booleanActions":  0,
        "category": 1000
    },
    {
        "entityKey":  "targetedAppManagementLevels",
        "nameResourceKey":  "managementType",        
        "descriptionResourceKey":  "",
        "dataType":  13,
        "category": "SettingDetails.Apps",
            "options":  [
                {
                    "nameResourceKey":  "AppProtection.allAppTypes",
                    "descriptionResourceKey":  "",
                    "value":  "unspecified"
                },
                {
                    "nameResourceKey":  "AppProtection.appsOnUnmanagedDevices",
                    "descriptionResourceKey":  "",
                    "value":  "unmanaged"
                },
                {
                    "nameResourceKey":  "AppProtection.appsOnIntuneManagedDevices",
                    "descriptionResourceKey":  "",
                    "value":  "mdm"
                },
                {
                    "nameResourceKey":  "AppProtection.appsInAndroidWorkProfile",
                    "descriptionResourceKey":  "",
                    "value":  "androidEnterprise"
                }
            ]
    },
    {
        "nameResourceKey":  "publicApps",
        "descriptionResourceKey":  "",
        "entityKey":  "apps",
        "dataType":  21,
        "category": "SettingDetails.Apps"
    },
    {
        "dataType":  8,
        "nameResourceKey":  "dataTransfer"
    },    
    {
        "nameResourceKey":  "TAPSettings.AndroidBackup.label",
        "descriptionResourceKey":  "TAPSettings.AndroidBackup.tooltip",
        "entityKey":  "dataBackupBlocked",
        "dataType":  0,
        "booleanActions":  100,
        "category": "SettingDetails.dataProtection"
    },
    {
        "nameResourceKey":  "TAPSettings.SendData.label",
        "descriptionResourceKey":  "TAPSettings.SendData.tooltip",
        "entityKey":  "allowedOutboundDataTransferDestinations",
        "dataType":  16,
        "booleanActions":  0,
        "category": "SettingDetails.dataProtection",
        "options":  [
            {
                "nameResourceKey":  "policyManagedAppsOptionText",
                "descriptionResourceKey":  "",
                "value":  "managedApps"
            },
            {
                "nameResourceKey":  "allAppsOptionText",
                "descriptionResourceKey":  "",
                "value":  "allApps"
            },
            {
                "nameResourceKey":  "noneOptionText",
                "descriptionResourceKey":  "",
                "value":  "none"
            }
        ]            
    },
    {
        "nameResourceKey":  "selectExemptApps",
        "descriptionResourceKey":  "",
        "entityKey":  "exemptedAppPackages",
        "dataType":  21,
        "category": "SettingDetails.dataProtection",
        "Columns": [
            {
                "metadata": {
                    "entityKey": "Name"
                }
            },
            {
                "metadata": {
                    "entityKey": "Value"
                }
            }
        ]
    },
    {
        "nameResourceKey":  "TAPSettings.SaveData.label",
        "descriptionResourceKey":  "TAPSettings.SaveData.tooltip",
        "entityKey":  "saveAsBlocked",
        "dataType":  0,
        "booleanActions":  100,
        "category": "SettingDetails.dataProtection"
    },
    {
        "nameResourceKey":  "TAPSettings.SaveDataToSelected.label",
        "descriptionResourceKey":  "TAPSettings.SaveDataToSelected.tooltip",
        "entityKey":  "allowedDataStorageLocations",
        "dataType":  13,
        "booleanActions":  0,
        "category": "SettingDetails.dataProtection",
        "options":  [
            {
                "nameResource":  "OneDrive for Business",
                "descriptionResourceKey":  "",
                "value":  "oneDriveForBusiness"
            },
            {
                "nameResource":  "SharePoint",
                "descriptionResourceKey":  "",
                "value":  "sharePoint"
            },
            {
                "nameResourceKey":  "localStorage",
                "descriptionResourceKey":  "",
                "value":  "localStorage"
            }
        ]
    },
    {
        "nameResourceKey":  "TAPSettings.DialerRestrictionLevel.label",
        "descriptionResourceKey":  "TAPSettings.DialerRestrictionLevel.tooltip",
        "entityKey":  "dialerRestrictionLevel",
        "dataType":  16,
        "booleanActions":  0,
        "category": "SettingDetails.dataProtection",
        "options":  [
            {
                "nameResourceKey":  "anyDialerAppOptionText",
                "descriptionResourceKey":  "",
                "value":  "allApps"
            },
            {
                "nameResourceKey":  "anyPolicyManagedDialerAppOptionText",
                "descriptionResourceKey":  "",
                "value":  "managedApps"
            },
            {
                "nameResourceKey":  "customDialerAppOptionText",
                "descriptionResourceKey":  "",
                "value":  "customApp"
            },
            {
                "nameResourceKey":  "noneDialerAppOptionText",
                "descriptionResourceKey":  "",
                "value":  "blocked"
            }
        ]
    },
    {
        "nameResourceKey":  "TAPSettings.CustomDialerAppPackageId.label",
        "descriptionResourceKey":  "",
        "entityKey":  "customDialerAppPackageId",
        "dataType":  20,
        "booleanActions":  0,
        "category": "SettingDetails.dataProtection"
    },
    {
        "nameResourceKey":  "TAPSettings.CustomDialerAppDisplayName.label",
        "descriptionResourceKey":  "",
        "entityKey":  "customDialerAppDisplayName",
        "dataType":  20,
        "booleanActions":  0,
        "category": "SettingDetails.dataProtection"
    },
    {
        "nameResourceKey":  "TAPSettings.ReceiveData.label",
        "descriptionResourceKey":  "TAPSettings.ReceiveData.tooltip",
        "entityKey":  "allowedInboundDataTransferSources",
        "dataType":  16,
        "booleanActions":  0,
        "category": "SettingDetails.dataProtection",
        "options":  [
            {
                "nameResourceKey":  "allAppsOptionText",
                "descriptionResourceKey":  "",
                "value":  "allApps"
            },
            {
                "nameResourceKey":  "policyManagedAppsOptionText",
                "descriptionResourceKey":  "",
                "value":  "managedApps"
            },
            {
                "nameResourceKey":  "none",
                "descriptionResourceKey":  "",
                "value":  "none"
            }
        ]
    },
    {
        "nameResourceKey":  "TAPSettings.BlockDataIngestionIntoOrganizationDocuments.label",
        "descriptionResourceKey":  "",
        "entityKey":  "blockDataIngestionIntoOrganizationDocuments",
        "dataType":  0,
        "booleanActions":  100,
        "category": "SettingDetails.dataProtection",
        "childSettings": [
        ]
    },
    {
        "nameResourceKey":  "TAPSettings.AllowedDataIngestionLocations.label",
        "descriptionResourceKey":  "TAPSettings.AllowedDataIngestionLocations.tooltip",
        "entityKey":  "allowedDataIngestionLocations",
        "dataType":  13,
        "booleanActions":  0,
        "category": "SettingDetails.dataProtection",
        "options":  [
            {
                "nameResource":  "OneDrive for Business",
                "descriptionResourceKey":  "",
                "value":  "oneDriveForBusiness"
            },
            {
                "nameResource":  "SharePoint",
                "descriptionResourceKey":  "",
                "value":  "sharePoint"
            },
            {
                "nameResourceKey":  "camera",
                "descriptionResourceKey":  "",
                "value":  "camera"
            }
        ]
    },    
    {
        "nameResourceKey":  "TAPSettings.Cutcopypaste.label",
        "descriptionResourceKey":  "TAPSettings.Cutcopypaste.tooltip",
        "entityKey":  "allowedOutboundClipboardSharingLevel",
        "dataType":  16,
        "booleanActions":  0,
        "category": "SettingDetails.dataProtection",
        "options":  [
            {
                "nameResourceKey":  "anyAppOptionText",
                "descriptionResourceKey":  "",
                "value":  "allApps"
            },
            {
                "nameResourceKey":  "policyManagedAppsOptionText",
                "descriptionResourceKey":  "",
                "value":  "managedApps"
            },
            {
                "nameResourceKey":  "policyManagedAppsWithPasteInOptionText",
                "descriptionResourceKey":  "",
                "value":  "managedAppsWithPasteIn"
            },
            {
                "nameResourceKey":  "blockedOptionText",
                "descriptionResourceKey":  "",
                "value":  "blocked"
            }
        ]
    },
    {
        "nameResourceKey":  "cCPExceptionLabel",
        "descriptionResourceKey":  "",
        "entityKey":  "allowedOutboundClipboardSharingExceptionLength",
        "dataType":  14,
        "category": "SettingDetails.dataProtection"
    },
    {
        "nameResourceKey":  "TAPSettings.ScreenCaptureAndAndroidAssistant.label",
        "descriptionResourceKey":  "TAPSettings.ScreenCaptureAndAndroidAssistant.tooltip",
        "entityKey":  "screenCaptureBlocked",
        "dataType":  0,
        "booleanActions":  100,
        "category": "SettingDetails.dataProtection",
        "childSettings": [
        ]
    },
    {
        "nameResourceKey":  "TAPSettings.RestrictKeyboards.label",
        "descriptionResourceKey":  "TAPSettings.RestrictKeyboards.tooltip",
        "entityKey":  "keyboardsRestricted",
        "dataType":  0,
        "booleanActions":  101,
        "category": "SettingDetails.dataProtection",
        "childSettings": [
        ]
    },
    {
        "nameResourceKey":  "TAPSettings.RestrictKeyboards.select",
        "descriptionResourceKey":  "",
        "entityKey":  "approvedKeyboards",
        "dataType":  21,
        "category": "SettingDetails.dataProtection",
        "Columns": [
            {
                "metadata": {
                    "entityKey": "value"
                }
            },
            {
                "metadata": {
                    "entityKey": "name"
                }
            }
        ]
    },
    {
        "dataType":  8,
        "nameResourceKey":  "encryption"
    }, 
    {
        "nameResourceKey":  "TAPSettings.EncryptData.label",
        "descriptionResourceKey":  "TAPSettings.EncryptData.tooltip",
        "entityKey":  "encryptAppData",
        "dataType":  0,
        "booleanActions":  101,
        "category": "SettingDetails.dataProtection",
        "childSettings": [
        ]
    },
    {
        "nameResourceKey":  "TAPSettings.EncryptDataOnEnrolledDevices.label",
        "descriptionResourceKey":  "TAPSettings.EncryptDataOnEnrolledDevices.tooltip",
        "entityKey":  "disableAppEncryptionIfDeviceEncryptionIsEnabled",
        "dataType":  0,
        "booleanActions":  201,
        "category": "SettingDetails.dataProtection",
        "childSettings": [
        ]
    },
    {
        "dataType":  8,
        "nameResourceKey":  "functionality"
    }, 
    {
        "nameResourceKey":  "TAPSettings.SyncContacts.label",
        "descriptionResourceKey":  "",
        "entityKey":  "contactSyncBlocked",
        "dataType":  0,
        "booleanActions":  100,
        "category": "SettingDetails.dataProtection",
        "childSettings": [
        ]
    },
    {
        "nameResourceKey":  "TAPSettings.Printing.label",
        "descriptionResourceKey":  "TAPSettings.Printing.tooltip",
        "entityKey":  "printBlocked",
        "dataType":  0,
        "booleanActions":  100,
        "category": "SettingDetails.dataProtection",
        "childSettings": [
        ]
    },
    {
        "nameResourceKey":  "TAPSettings.OpenLinksManagedBrowser.label",
        "descriptionResourceKey":  "TAPSettings.OpenLinksManagedBrowser.tooltip",
        "entityKey":  "managedBrowserSelection",
        "dataType":  16,
        "booleanActions":  0,
        "category": "SettingDetails.dataProtection",
        "options":  [
            {
                "nameResourceKey":  "anyAppOptionText",
                "descriptionResourceKey":  "",
                "value":  "notConfigured"
            },
            {
                "nameResourceKey":  "microsoftEdgeOptionText",
                "descriptionResourceKey":  "",
                "value":  "microsoftEdge"
            },
            {
                "nameResourceKey":  "unmanagedBrowserOptionText",
                "descriptionResourceKey":  "",
                "value":  "unmanagedBrowser"
            }
        ]
    },
    {
        "nameResourceKey":  "TAPSettings.CustomBrowserPackageId.label",
        "descriptionResourceKey":  "TAPSettings.CustomBrowserPackageId.tooltip",
        "entityKey":  "customBrowserPackageId",
        "dataType":  20,
        "booleanActions":  0,
        "category": "SettingDetails.dataProtection"
    },
    {
        "nameResourceKey":  "TAPSettings.CustomBrowserDisplayName.label",
        "descriptionResourceKey":  "TAPSettings.CustomBrowserDisplayName.tooltip",
        "entityKey":  "customBrowserDisplayName",
        "dataType":  20,
        "booleanActions":  0,
        "category": "SettingDetails.dataProtection"
    },
    {
        "nameResourceKey":  "TAPSettings.NotificationRestriction.label",
        "descriptionResourceKey":  "TAPSettings.NotificationRestriction.tooltip",
        "entityKey":  "notificationRestriction",
        "dataType":  16,
        "booleanActions":  0,
        "category": "SettingDetails.dataProtection",
        "options":  [
            {
                "nameResourceKey":  "allowOption",
                "descriptionResourceKey":  "",
                "value":  "allow"
            },
            {
                "nameResourceKey":  "blockOrgDataOptionText",
                "descriptionResourceKey":  "",
                "value":  "blockOrganizationalData"
            },
            {
                "nameResourceKey":  "blockOption",
                "descriptionResourceKey":  "",
                "value":  "block"
            }
        ]
    },
    {
        "dataType":  8,
        "nameResourceKey":  "empty"
    }, 
    {
        "nameResourceKey":  "TAPSettings.PinAccess.label",
        "descriptionResourceKey":  "TAPSettings.PinAccess.tooltip",
        "entityKey":  "pinRequired",
        "dataType":  0,
        "booleanActions":  101,
        "category": "SettingDetails.accessRequirements"
    },
    {
        "nameResourceKey":  "TAPSettings.PinType.label",
        "descriptionResourceKey":  "TAPSettings.PinType.tooltip",
        "entityKey":  "pinCharacterSet",
        "dataType":  16,
        "booleanActions":  0,
        "category": "SettingDetails.accessRequirements",
        "options":  [
            {
                "nameResourceKey":  "numericOption",
                "descriptionResourceKey":  "",
                "value":  "numeric"
            },
            {
                "nameResourceKey":  "alphanumericOption",
                "descriptionResourceKey":  "",
                "value":  "alphanumericAndSymbol"
            }
        ]        
    },
    {
        "nameResourceKey":  "TAPSettings.SimplePin.label",
        "descriptionResourceKey":  "TAPSettings.SimplePin.tooltip",
        "entityKey":  "simplePinBlocked",
        "dataType":  0,
        "booleanActions":  100,
        "category": "SettingDetails.accessRequirements"
    },
    {
        "nameResourceKey":  "TAPSettings.PinLength.label",
        "descriptionResourceKey":  "TAPSettings.PinLength.tooltip",
        "entityKey":  "minimumPinLength",
        "dataType":  14,
        "booleanActions":  0,
        "category": "SettingDetails.accessRequirements"
    },
    {
        "nameResourceKey":  "TAPSettings.AndroidFingerprint.label",
        "descriptionResourceKey":  "TAPSettings.AndroidFingerprint.tooltip",
        "entityKey":  "fingerprintBlocked",
        "dataType":  0,
        "booleanActions":  100,
        "category": "SettingDetails.accessRequirements"
    },
    {
        "nameResourceKey":  "TAPSettings.AndroidOverrideFingerprint.label",
        "descriptionResourceKey":  "",
        "entityKey":  "overrideFingerprint",
        "dataType":  0,
        "booleanActions":  101,
        "category": "SettingDetails.accessRequirements",
        "childSettings": [
        ]
    },
    {
        "nameResourceKey":  "TAPSettings.Timeout.label",
        "descriptionResourceKey":  "",
        "entityKey":  "pinRequiredInsteadOfBiometricTimeout",
        "dataType":  100,
        "booleanActions":  0,
        "category": "SettingDetails.accessRequirements"
    },
    {
        "nameResourceKey":  "TAPSettings.AndroidBiometricAuthentication.label",
        "descriptionResourceKey":  "TAPSettings.AndroidBiometricAuthentication.tooltip",
        "entityKey":  "biometricAuthenticationBlocked",
        "dataType":  0,
        "booleanActions":  100,
        "category": "SettingDetails.accessRequirements"
    },
    {
        "nameResourceKey":  "TAPSettings.Tap.pinResetAfterNumberOfDays",
        "descriptionResourceKey":  "",
        "entityKey":  "pinReset",
        "dataType":  0,
        "booleanActions":  109,
        "category": "SettingDetails.accessRequirements"
    },
    {
        "nameResourceKey":  "TAPSettings.Tap.numberOfDays",
        "descriptionResourceKey":  "",
        "entityKey":  "periodBeforePinReset",
        "dataType":  100,
        "booleanActions":  0,
        "category": "SettingDetails.accessRequirements"
    },
    {
        "nameResourceKey":  "TAPSettings.Tap.previousPinBlockCount",
        "descriptionResourceKey":  "",
        "entityKey":  "previousPinBlockCount",
        "dataType":  14,
        "booleanActions":  0,
        "category": "SettingDetails.accessRequirements"
    },
    {
        "nameResourceKey":  "TAPSettings.AppPIN.label",
        "descriptionResourceKey":  "TAPSettings.AppPIN.tooltip",
        "entityKey":  "disableAppPinIfDevicePinIsSet",
        "dataType":  0,
        "booleanActions":  201,
        "category": "SettingDetails.accessRequirements"
    },
    {
        "nameResourceKey":  "TAPSettings.CredentialsForAccess.label",
        "descriptionResourceKey":  "TAPSettings.CredentialsForAccess.tooltip",
        "entityKey":  "organizationalCredentialsRequired",
        "dataType":  0,
        "booleanActions":  101,
        "category": "SettingDetails.accessRequirements"
    },
    {
        "nameResourceKey":  "TAPSettings.RecheckAccessAfter.label",
        "descriptionResourceKey":  "TAPSettings.RecheckAccessAfter.tooltip",
        "entityKey":  "periodOnlineBeforeAccessCheck",
        "dataType":  100,
        "booleanActions":  0,
        "category": "SettingDetails.accessRequirements"
    },
    {
        "dataType":  8,
        "nameResourceKey":  ""
    },
    {
        "nameResourceKey":  "SettingDetails.conditionalLaunch",
        "descriptionResourceKey":  "",
        "entityKey":  "ConditionalLaunchSettings",
        "dataType":  21,
        "category": "SettingDetails.conditionalLaunch",
        "Columns": [
            {
                "metadata": {
                    "entityKey": "Setting"
                }
            },
            {
                "metadata": {
                    "entityKey": "Value"
                }
            },
            {
                "metadata": {
                    "entityKey": "Action"
                }
            }
        ]
    }
 ]
--- a/Documentation/ObjectInfo/#microsoft.graph.deviceCustomAttributeShellScript.json
+++ b/Documentation/ObjectInfo/#microsoft.graph.deviceCustomAttributeShellScript.json
@@ -1,43 +0,0 @@
 [
    {
        "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"
    }
 ]    
--- a/Documentation/ObjectInfo/#microsoft.graph.deviceEnrollmentLimitConfiguration.json
+++ b/Documentation/ObjectInfo/#microsoft.graph.deviceEnrollmentLimitConfiguration.json
@@ -1,23 +0,0 @@
 [
    {
        "dataType":  8,
        "booleanActions":  0,
        "category": "SettingDetails.deviceLimit"
    },
    {
        "nameResourceKey":  "SettingDetails.deviceLimit",
        "descriptionResourceKey":  "",
        "entityKey":  "limit",
        "dataType":  14,
        "booleanActions":  0,
        "category":  "SettingDetails.deviceLimit"
    },
    {
        "nameResourceKey":  "TableHeaders.priority",
        "descriptionResourceKey":  "",
        "entityKey":  "priority",
        "dataType":  14,
        "booleanActions":  0,
        "category":  "SettingDetails.deviceLimit"
    }  
 ]
--- a/Documentation/ObjectInfo/#microsoft.graph.deviceEnrollmentPlatformRestrictionsConfiguration.json
+++ b/Documentation/ObjectInfo/#microsoft.graph.deviceEnrollmentPlatformRestrictionsConfiguration.json
@@ -1,417 +0,0 @@
 [
    {
        "dataType":  8,
        "booleanActions":  0,
        "nameResourceKey": "Devices.androidWorkProfile"
    },
    {
        "nameResourceKey":  "",
        "descriptionResourceKey":  "",
        "entityKey":  "androidForWorkRestriction",
        "dataType":  6,
        "booleanActions":  0,
        "category": "",
        "complexOptions": [
            {
                "nameResourceKey":  "TableHeaders.platform",
                "descriptionResourceKey":  "",
                "entityKey":  "platformBlocked",
                "dataType":  0,
                "booleanActions":  100,
                "category":  "EnrollmentRestrictions.DeviceType.platformSettings",
                "Children": {
                    "nameResourceKey":  "",
                    "descriptionResourceKey":  "",
                    "entityKey":  "",
                    "dataType":  5,
                    "booleanActions":  0,
                    "category": "",                    
                    "Condition": {
                        "Expressions": [
                            {
                                "property": "platformBlocked",
                                "value": false
                            }
                        ]
                    },
                    "complexOptions": [
                        {
                            "nameResourceKey":  "EnrollmentRestrictions.DeviceType.versions",
                            "descriptionResourceKey":  "",
                            "entityKey":  ".",
                            "dataType":  21,
                            "separator": "-",
                            "category": "EnrollmentRestrictions.DeviceType.platformSettings",                                                
                            "Condition": {
                                "type": "and",
                                "Expressions": [
                                    {
                                        "property": "osMinimumVersion"
                                    },
                                    {
                                        "property": "osMaximumVersion"
                                    }
                                ]
                            },
                            "Columns": [
                                {
                                    "metadata": {
                                        "entityKey": "osMinimumVersion"
                                    }
                                },
                                {
                                    "metadata": {
                                        "entityKey": "osMaximumVersion"
                                    }
                                }
                            ]
                        },                        
                        {
                            "nameResourceKey":  "EnrollmentRestrictions.DeviceType.personal",
                            "descriptionResourceKey":  "",
                            "entityKey":  "personalDeviceEnrollmentBlocked",
                            "dataType":  0,
                            "booleanActions":  100,
                            "category":  "EnrollmentRestrictions.DeviceType.platformSettings"                        
                        },
                        {
                            "nameResourceKey":  "EnrollmentRestrictions.DeviceType.blockManufacturersHeader",
                            "descriptionResourceKey":  "",
                            "entityKey":  "blockedManufacturers",
                            "dataType":  21,
                            "separator": "-",
                            "category": "EnrollmentRestrictions.DeviceType.platformSettings",                                                
                            "Condition": {
                                "type": "and",
                                "Expressions": [
                                    {
                                        "property": "blockedManufacturers"
                                    }
                                ]
                            },
                            "Columns": [
                                {
                                    "metadata": {
                                        "entityKey": "unusedForSingleItems"
                                    }
                                }
                            ]
                        }
                    ]
                }                
            }
        ]
    },
    {
        "dataType":  8,
        "booleanActions":  0,
        "nameResourceKey": "Devices.android"
    },
    {
        "nameResourceKey":  "",
        "descriptionResourceKey":  "",
        "entityKey":  "androidRestriction",
        "dataType":  6,
        "booleanActions":  0,
        "category": "",
        "complexOptions": [
            {
                "nameResourceKey":  "TableHeaders.platform",
                "descriptionResourceKey":  "",
                "entityKey":  "platformBlocked",
                "dataType":  0,
                "booleanActions":  100,
                "category":  "EnrollmentRestrictions.DeviceType.platformSettings",
                "Children": {
                    "nameResourceKey":  "",
                    "descriptionResourceKey":  "",
                    "entityKey":  "",
                    "dataType":  5,
                    "booleanActions":  0,
                    "category": "",                    
                    "Condition": {
                        "Expressions": [
                            {
                                "property": "platformBlocked",
                                "value": false
                            }
                        ]
                    },
                    "complexOptions": [
                        {
                            "nameResourceKey":  "EnrollmentRestrictions.DeviceType.versions",
                            "descriptionResourceKey":  "",
                            "entityKey":  ".",
                            "dataType":  21,
                            "separator": "-",
                            "category": "EnrollmentRestrictions.DeviceType.platformSettings",                                                
                            "Condition": {
                                "type": "and",
                                "Expressions": [
                                    {
                                        "property": "osMinimumVersion"
                                    },
                                    {
                                        "property": "osMaximumVersion"
                                    }
                                ]
                            },
                            "Columns": [
                                {
                                    "metadata": {
                                        "entityKey": "osMinimumVersion"
                                    }
                                },
                                {
                                    "metadata": {
                                        "entityKey": "osMaximumVersion"
                                    }
                                }
                            ]
                        },                        
                        {
                            "nameResourceKey":  "EnrollmentRestrictions.DeviceType.personal",
                            "descriptionResourceKey":  "",
                            "entityKey":  "personalDeviceEnrollmentBlocked",
                            "dataType":  0,
                            "booleanActions":  100,
                            "category":  "EnrollmentRestrictions.DeviceType.platformSettings"                        
                        },
                        {
                            "nameResourceKey":  "EnrollmentRestrictions.DeviceType.blockManufacturersHeader",
                            "descriptionResourceKey":  "",
                            "entityKey":  "blockedManufacturers",
                            "dataType":  21,
                            "separator": "-",
                            "category": "EnrollmentRestrictions.DeviceType.platformSettings",                                                
                            "Condition": {
                                "type": "and",
                                "Expressions": [
                                    {
                                        "property": "blockedManufacturers"
                                    }
                                ]
                            },
                            "Columns": [
                                {
                                    "metadata": {
                                        "entityKey": "unusedForSingleItems"
                                    }
                                }
                            ]
                        }
                    ]
                }                
            }
        ]
    },
    {
        "dataType":  8,
        "booleanActions":  0,
        "nameResourceKey": "Devices.iOS"
    },
    {
        "nameResourceKey":  "",
        "descriptionResourceKey":  "",
        "entityKey":  "iosRestriction",
        "dataType":  6,
        "booleanActions":  0,
        "category": "",
        "complexOptions": [
            {
                "nameResourceKey":  "TableHeaders.platform",
                "descriptionResourceKey":  "",
                "entityKey":  "platformBlocked",
                "dataType":  0,
                "booleanActions":  100,
                "category":  "EnrollmentRestrictions.DeviceType.platformSettings",
                "Children": {
                    "nameResourceKey":  "",
                    "descriptionResourceKey":  "",
                    "entityKey":  "",
                    "dataType":  5,
                    "booleanActions":  0,
                    "category": "",                    
                    "Condition": {
                        "Expressions": [
                            {
                                "property": "platformBlocked",
                                "value": false
                            }
                        ]
                    },
                    "complexOptions": [
                        {
                            "nameResourceKey":  "EnrollmentRestrictions.DeviceType.versions",
                            "descriptionResourceKey":  "",
                            "entityKey":  ".",
                            "dataType":  21,
                            "separator": "-",
                            "category": "EnrollmentRestrictions.DeviceType.platformSettings",                                                
                            "Condition": {
                                "type": "and",
                                "Expressions": [
                                    {
                                        "property": "osMinimumVersion"
                                    },
                                    {
                                        "property": "osMaximumVersion"
                                    }
                                ]
                            },
                            "Columns": [
                                {
                                    "metadata": {
                                        "entityKey": "osMinimumVersion"
                                    }
                                },
                                {
                                    "metadata": {
                                        "entityKey": "osMaximumVersion"
                                    }
                                }
                            ]
                        },                        
                        {
                            "nameResourceKey":  "EnrollmentRestrictions.DeviceType.personal",
                            "descriptionResourceKey":  "",
                            "entityKey":  "personalDeviceEnrollmentBlocked",
                            "dataType":  0,
                            "booleanActions":  100,
                            "category":  "EnrollmentRestrictions.DeviceType.platformSettings"                        
                        }
                    ]
                }                
            }
        ]
    },
    {
        "dataType":  8,
        "booleanActions":  0,
        "nameResourceKey": "Devices.mac"
    },
    {
        "nameResourceKey":  "",
        "descriptionResourceKey":  "",
        "entityKey":  "macRestriction",
        "dataType":  6,
        "booleanActions":  0,
        "category": "",
        "complexOptions": [
            {
                "nameResourceKey":  "TableHeaders.platform",
                "descriptionResourceKey":  "",
                "entityKey":  "platformBlocked",
                "dataType":  0,
                "booleanActions":  100,
                "category":  "EnrollmentRestrictions.DeviceType.platformSettings",
                "Children": {
                    "nameResourceKey":  "",
                    "descriptionResourceKey":  "",
                    "entityKey":  "",
                    "dataType":  5,
                    "booleanActions":  0,
                    "category": "",                    
                    "Condition": {
                        "Expressions": [
                            {
                                "property": "platformBlocked",
                                "value": false
                            }
                        ]
                    },
                    "complexOptions": [                                               
                        {
                            "nameResourceKey":  "EnrollmentRestrictions.DeviceType.personal",
                            "descriptionResourceKey":  "",
                            "entityKey":  "personalDeviceEnrollmentBlocked",
                            "dataType":  0,
                            "booleanActions":  100,
                            "category":  "EnrollmentRestrictions.DeviceType.platformSettings"                        
                        }
                    ]
                }                
            }
        ]
    },
    {
        "dataType":  8,
        "booleanActions":  0,
        "nameResourceKey": "Devices.windows"
    },
    {
        "nameResourceKey":  "",
        "descriptionResourceKey":  "",
        "entityKey":  "windowsRestriction",
        "dataType":  6,
        "booleanActions":  0,
        "category": "",
        "complexOptions": [
            {
                "nameResourceKey":  "TableHeaders.platform",
                "descriptionResourceKey":  "",
                "entityKey":  "platformBlocked",
                "dataType":  0,
                "booleanActions":  100,
                "category":  "EnrollmentRestrictions.DeviceType.platformSettings",
                "Children": {
                    "nameResourceKey":  "",
                    "descriptionResourceKey":  "",
                    "entityKey":  "",
                    "dataType":  5,
                    "booleanActions":  0,
                    "category": "",                    
                    "Condition": {
                        "Expressions": [
                            {
                                "property": "platformBlocked",
                                "value": false
                            }
                        ]
                    },
                    "complexOptions": [
                        {
                            "nameResourceKey":  "EnrollmentRestrictions.DeviceType.versions",
                            "descriptionResourceKey":  "",
                            "entityKey":  ".",
                            "dataType":  21,
                            "separator": "-",
                            "category": "EnrollmentRestrictions.DeviceType.platformSettings",                                                
                            "Condition": {
                                "type": "and",
                                "Expressions": [
                                    {
                                        "property": "osMinimumVersion"
                                    },
                                    {
                                        "property": "osMaximumVersion"
                                    }
                                ]
                            },
                            "Columns": [
                                {
                                    "metadata": {
                                        "entityKey": "osMinimumVersion"
                                    }
                                },
                                {
                                    "metadata": {
                                        "entityKey": "osMaximumVersion"
                                    }
                                }
                            ]
                        },                        
                        {
                            "nameResourceKey":  "EnrollmentRestrictions.DeviceType.personal",
                            "descriptionResourceKey":  "",
                            "entityKey":  "personalDeviceEnrollmentBlocked",
                            "dataType":  0,
                            "booleanActions":  100,
                            "category":  "EnrollmentRestrictions.DeviceType.platformSettings"                        
                        }
                    ]
                }                
            }
        ]
    }
 ]
--- a/Documentation/ObjectInfo/#microsoft.graph.deviceHealthScript.json
+++ b/Documentation/ObjectInfo/#microsoft.graph.deviceHealthScript.json
@@ -1,41 +0,0 @@
 [
    {
        "nameResourceKey":  "ProactiveRemediations.Create.Settings.DetectionScriptMultiLineTextBox.label",
        "descriptionResourceKey":  "",
        "entityKey":  "detectionScriptAdded",
        "dataType":  0,
        "booleanActions":  109,
        "category": "WindowsManagement.scriptsettingsTabHeader"
    },
    {
        "nameResourceKey":  "ProactiveRemediations.Create.Settings.RemediationScriptMultiLineTextBox.label",
        "descriptionResourceKey":  "",
        "entityKey":  "remediationScriptAdded",
        "dataType":  0,
        "booleanActions":  109,
        "category": "WindowsManagement.scriptsettingsTabHeader"
    },
    {
        "nameResourceKey":  "ProactiveRemediations.Create.Settings.LoggedOnCredentialsOptionPicker.label",
        "descriptionResourceKey":  "",
        "entityKey":  "useLoggedOnCredentials",
        "dataType":  0,
        "booleanActions":  109
    },
    {
        "nameResourceKey":  "ProactiveRemediations.Create.Settings.EnforceScriptSignatureCheckOptionPicker.label",
        "descriptionResourceKey":  "",
        "entityKey":  "enforceSignatureCheck",
        "dataType":  0,
        "booleanActions":  109
    },
    {
        "nameResourceKey":  "ProactiveRemediations.Create.Settings.RunIn64BitPSOptionPicker.label",
        "descriptionResourceKey":  "",
        "entityKey":  "runAs32Bit",
        "dataType":  0,
        "booleanActions":  110
    }
 ]
--- a/Documentation/ObjectInfo/#microsoft.graph.deviceManagementScript.json
+++ b/Documentation/ObjectInfo/#microsoft.graph.deviceManagementScript.json
@@ -1,54 +0,0 @@
 [
    {
        "nameResourceKey":  "TableHeaders.configurationType",
        "descriptionResourceKey":  "",
        "entityKey":  "WindowsManagement.powerShellScriptObjectName",
        "dataType":  200,
        "booleanActions":  0,
        "category": 1000
    },
    {
        "nameResourceKey":  "WindowsManagement.powerShellScriptObjectName",
        "descriptionResourceKey":  "",
        "entityKey":  "fileName",
        "dataType":  20,
        "booleanActions":  0,
        "category": "WindowsManagement.scriptsettingsTabHeader"
    },
    {
        "nameResourceKey":  "WindowsManagement.scriptContextLabel",
        "descriptionResourceKey":  "WindowsManagement.scriptContextInfoBalloonContent",
        "entityKey":  "runAsAccount",
        "dataType":  16,
        "booleanActions":  0,
        "category": "WindowsManagement.scriptsettingsTabHeader",
        "options":  [
            {
                "nameResourceKey":  "no",
                "descriptionResourceKey":  "",
                "value":  "system"
            },
            {
                "nameResourceKey":  "yes",
                "descriptionResourceKey":  "",
                "value":  "user"
            }
        ]    
    },
    {
        "nameResourceKey":  "WindowsManagement.enforceSignatureCheckLabel",
        "descriptionResourceKey":  "WindowsManagement.enforceSignatureCheckInfoBalloonContent",
        "entityKey":  "enforceSignatureCheck",
        "dataType":  0,
        "booleanActions":  109,
        "category": "WindowsManagement.scriptsettingsTabHeader"
    },
    {
        "nameResourceKey":  "WindowsManagement.runAs64BitLabel",
        "descriptionResourceKey":  "WindowsManagement.runAs64BitInfoBalloonContent",
        "entityKey":  "runAs32Bit",
        "dataType":  0,
        "booleanActions":  110,
        "category": "WindowsManagement.scriptsettingsTabHeader"
    }  
 ]
--- a/Documentation/ObjectInfo/#microsoft.graph.deviceShellScript.json
+++ b/Documentation/ObjectInfo/#microsoft.graph.deviceShellScript.json
@@ -1,121 +0,0 @@
 [
    {
        "nameResourceKey":  "TableHeaders.configurationType",
        "descriptionResourceKey":  "",
        "entityKey":  "WindowsManagement.shellScriptObjectName",
        "dataType":  200,
        "booleanActions":  0,
        "category": 1000
    },
    {
        "nameResourceKey":  "WindowsManagement.shellScriptObjectName",
        "descriptionResourceKey":  "",
        "entityKey":  "fileName",
        "dataType":  20,
        "booleanActions":  0,
        "category": "WindowsManagement.scriptsettingsTabHeader"
    },
    {
        "nameResourceKey":  "WindowsManagement.scriptContextLabel",
        "descriptionResourceKey":  "WindowsManagement.scriptContextInfoBalloonContent",
        "entityKey":  "runAsAccount",
        "dataType":  16,
        "booleanActions":  0,
        "category": "WindowsManagement.scriptsettingsTabHeader",
        "options":  [
            {
                "nameResourceKey":  "no",
                "descriptionResourceKey":  "",
                "value":  "system"
            },
            {
                "nameResourceKey":  "yes",
                "descriptionResourceKey":  "",
                "value":  "user"
            }
        ]    
    },
    {
        "nameResourceKey":  "WindowsManagement.Mac.blockNotifications",
        "descriptionResourceKey":  "WindowsManagement.Mac.blockNotificationToolTip.toolTip",
        "entityKey":  "blockExecutionNotifications",
        "dataType":  0,
        "booleanActions":  109,
        "category": "WindowsManagement.scriptsettingsTabHeader"
    },
    {
        "nameResourceKey":  "WindowsManagement.Mac.executionFrequency",
        "descriptionResourceKey":  "WindowsManagement.Mac.executionFrequencyToolTip.toolTip",
        "entityKey":  "executionFrequency",
        "dataType":  16,
        "booleanActions":  0,
        "category": "WindowsManagement.scriptsettingsTabHeader",
        "options":  [
            {
                "nameResourceKey":  "WindowsManagement.PolicyFrequency.days1",
                "descriptionResourceKey":  "",
                "value":  "PT1D"
            },
            {
                "nameResourceKey":  "WindowsManagement.PolicyFrequency.hours1",
                "descriptionResourceKey":  "",
                "value":  "PT1H"
            },
            {
                "nameResourceKey":  "WindowsManagement.PolicyFrequency.hours12",
                "descriptionResourceKey":  "",
                "value":  "PT12H"
            },
            {
                "nameResourceKey":  "WindowsManagement.PolicyFrequency.hours2",
                "descriptionResourceKey":  "",
                "value":  "PT2H"
            },
            {
                "nameResourceKey":  "WindowsManagement.PolicyFrequency.hours3",
                "descriptionResourceKey":  "",
                "value":  "PT3H"
            },
            {
                "nameResourceKey":  "WindowsManagement.PolicyFrequency.hours6",
                "descriptionResourceKey":  "",
                "value":  "PT6H"
            },
            {
                "nameResourceKey":  "WindowsManagement.PolicyFrequency.minutes15",
                "descriptionResourceKey":  "",
                "value":  "PT15M"
            },
            {
                "nameResourceKey":  "WindowsManagement.PolicyFrequency.minutes30",
                "descriptionResourceKey":  "",
                "value":  "PT30M"
            }
        ]        
    },
    {
        "nameResourceKey":  "WindowsManagement.Mac.scriptRetry",
        "descriptionResourceKey":  "",
        "entityKey":  "retryCount",
        "dataType":  16,
        "booleanActions":  0,
        "category": "WindowsManagement.scriptsettingsTabHeader",
        "options":  [
            {
                "nameResourceKey":  "WindowsManagement.PolicyRetry.times1",
                "descriptionResourceKey":  "",
                "value":  "1"
            },
            {
                "nameResourceKey":  "WindowsManagement.PolicyRetry.times2",
                "descriptionResourceKey":  "",
                "value":  "2"
            },
            {
                "nameResourceKey":  "WindowsManagement.PolicyRetry.times3",
                "descriptionResourceKey":  "",
                "value":  "3"
            }
        ]
    }
 ]
--- a/Documentation/ObjectInfo/#microsoft.graph.hardwareConfiguration.json
+++ b/Documentation/ObjectInfo/#microsoft.graph.hardwareConfiguration.json
@@ -1,34 +0,0 @@
 [
    {
        "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"
    }
 ]
--- a/Documentation/ObjectInfo/#microsoft.graph.iosManagedAppProtection.json
+++ b/Documentation/ObjectInfo/#microsoft.graph.iosManagedAppProtection.json
@@ -1,556 +0,0 @@
 [
    {
        "nameResourceKey":  "TableHeaders.policyType",
        "descriptionResourceKey":  "",
        "entityKey":  "SettingDetails.appProtectionPolicy",
        "dataType":  200,
        "booleanActions":  0,
        "category": 1000
    },
    {
        "nameResourceKey":  "SettingDetails.platformSupported",
        "descriptionResourceKey":  "",
        "entityKey":  "AppProtection.iOSPlatformLabel",
        "dataType":  200,
        "booleanActions":  0,
        "category": 1000
    },
    {
        "entityKey":  "targetedAppManagementLevels",
        "nameResourceKey":  "managementType",        
        "descriptionResourceKey":  "",
        "dataType":  13,
        "category": "SettingDetails.Apps",
            "options":  [
                {
                    "nameResourceKey":  "AppProtection.allAppTypes",
                    "descriptionResourceKey":  "",
                    "value":  "unspecified"
                },
                {
                    "nameResourceKey":  "AppProtection.appsOnUnmanagedDevices",
                    "descriptionResourceKey":  "",
                    "value":  "unmanaged"
                },
                {
                    "nameResourceKey":  "AppProtection.appsOnIntuneManagedDevices",
                    "descriptionResourceKey":  "",
                    "value":  "mdm"
                },
                {
                    "nameResourceKey":  "AppProtection.appsInAndroidWorkProfile",
                    "descriptionResourceKey":  "",
                    "value":  "androidEnterprise"
                }
            ]
    },
    {
        "nameResourceKey":  "publicApps",
        "descriptionResourceKey":  "",
        "entityKey":  "apps",
        "dataType":  21,
        "category": "SettingDetails.Apps"
    },
    {
        "dataType":  8,
        "nameResourceKey":  "dataTransfer"
    },    
    {
        "nameResourceKey":  "TAPSettings.IOSBackup.label",
        "descriptionResourceKey":  "TAPSettings.IOSBackup.tooltip",
        "entityKey":  "dataBackupBlocked",
        "dataType":  0,
        "booleanActions":  100,
        "category": "SettingDetails.dataProtection"
    },
    {
        "nameResourceKey":  "TAPSettings.SendData.label",
        "descriptionResourceKey":  "TAPSettings.SendData.tooltip",
        "entityKey":  "sendDataSelector",
        "dataType":  16,
        "booleanActions":  0,
        "category": "SettingDetails.dataProtection",
        "options":  [
            {
                "nameResourceKey":  "policyManagedAppsOptionText",
                "descriptionResourceKey":  "",
                "value":  "managedApps"
            },
            {
                "nameResourceKey":  "allAppsOptionText",
                "descriptionResourceKey":  "",
                "value":  "allApps"
            },
            {
                "nameResourceKey":  "noneOptionText",
                "descriptionResourceKey":  "",
                "value":  "none"
            },
            {
                "nameResourceKey":  "managedAppsWithOpenInSharing",
                "descriptionResourceKey":  "",
                "value":  "managedAppsWithOpenInSharing"
            },
            {
                "nameResourceKey":  "managedAppsWithOSSharing",
                "descriptionResourceKey":  "",
                "value":  "managedAppsWithOSSharing"
            }
        ]            
    },
    {
        "nameResourceKey":  "selectExemptApps",
        "descriptionResourceKey":  "",
        "entityKey":  "exemptedAppProtocols",
        "dataType":  21,
        "category": "SettingDetails.dataProtection",
        "Columns": [
            {
                "metadata": {
                    "entityKey": "Name"
                }
            },
            {
                "metadata": {
                    "entityKey": "Value"
                }
            }
        ]
    },
    {
        "nameResourceKey":  "TAPSettings.SaveData.label",
        "descriptionResourceKey":  "TAPSettings.SaveData.tooltip",
        "entityKey":  "saveAsBlocked",
        "dataType":  0,
        "booleanActions":  100,
        "category": "SettingDetails.dataProtection"
    },
    {
        "nameResourceKey":  "TAPSettings.SaveDataToSelected.label",
        "descriptionResourceKey":  "TAPSettings.SaveDataToSelected.tooltip",
        "entityKey":  "allowedDataStorageLocations",
        "dataType":  13,
        "booleanActions":  0,
        "category": "SettingDetails.dataProtection",
        "options":  [
            {
                "nameResource":  "OneDrive for Business",
                "descriptionResourceKey":  "",
                "value":  "oneDriveForBusiness"
            },
            {
                "nameResource":  "SharePoint",
                "descriptionResourceKey":  "",
                "value":  "sharePoint"
            },
            {
                "nameResourceKey":  "localStorage",
                "descriptionResourceKey":  "",
                "value":  "localStorage"
            }
        ]
    },
    {
        "nameResourceKey":  "TAPSettings.DialerRestrictionLevel.label",
        "descriptionResourceKey":  "TAPSettings.DialerRestrictionLevel.tooltip",
        "entityKey":  "dialerRestrictionLevel",
        "dataType":  16,
        "booleanActions":  0,
        "category": "SettingDetails.dataProtection",
        "options":  [
            {
                "nameResourceKey":  "anyDialerAppOptionText",
                "descriptionResourceKey":  "",
                "value":  "allApps"
            },
            {
                "nameResourceKey":  "anyPolicyManagedDialerAppOptionText",
                "descriptionResourceKey":  "",
                "value":  "managedApps"
            },
            {
                "nameResourceKey":  "customDialerAppOptionText",
                "descriptionResourceKey":  "",
                "value":  "customApp"
            },
            {
                "nameResourceKey":  "noneDialerAppOptionText",
                "descriptionResourceKey":  "",
                "value":  "blocked"
            }
        ]
    },
    {
        "nameResourceKey":  "TAPSettings.CustomDialerAppProtocol.label",
        "descriptionResourceKey":  "",
        "entityKey":  "customDialerAppProtocol",
        "dataType":  20,
        "booleanActions":  0,
        "category": "SettingDetails.dataProtection"
    },
    {
        "nameResourceKey":  "TAPSettings.ReceiveData.label",
        "descriptionResourceKey":  "TAPSettings.ReceiveData.tooltip",
        "entityKey":  "allowedInboundDataTransferSources",
        "dataType":  16,
        "booleanActions":  0,
        "category": "SettingDetails.dataProtection",
        "options":  [
            {
                "nameResourceKey":  "allAppsOptionText",
                "descriptionResourceKey":  "",
                "value":  "allApps"
            },
            {
                "nameResourceKey":  "policyManagedAppsOptionText",
                "descriptionResourceKey":  "",
                "value":  "managedApps"
            },
            {
                "nameResourceKey":  "none",
                "descriptionResourceKey":  "",
                "value":  "none"
            }
        ]
    },
    {
        "nameResourceKey":  "TAPSettings.BlockDataIngestionIntoOrganizationDocuments.label",
        "descriptionResourceKey":  "",
        "entityKey":  "blockDataIngestionIntoOrganizationDocuments",
        "dataType":  0,
        "booleanActions":  100,
        "category": "SettingDetails.dataProtection",
        "childSettings": [
        ]
    },
    {
        "nameResourceKey":  "TAPSettings.AllowedDataIngestionLocations.label",
        "descriptionResourceKey":  "TAPSettings.AllowedDataIngestionLocations.tooltip",
        "entityKey":  "allowedDataIngestionLocations",
        "dataType":  13,
        "booleanActions":  0,
        "category": "SettingDetails.dataProtection",
        "options":  [
            {
                "nameResource":  "OneDrive for Business",
                "descriptionResourceKey":  "",
                "value":  "oneDriveForBusiness"
            },
            {
                "nameResource":  "SharePoint",
                "descriptionResourceKey":  "",
                "value":  "sharePoint"
            },
            {
                "nameResourceKey":  "camera",
                "descriptionResourceKey":  "",
                "value":  "camera"
            }
        ]
    },    
    {
        "nameResourceKey":  "TAPSettings.Cutcopypaste.label",
        "descriptionResourceKey":  "TAPSettings.Cutcopypaste.tooltip",
        "entityKey":  "allowedOutboundClipboardSharingLevel",
        "dataType":  16,
        "booleanActions":  0,
        "category": "SettingDetails.dataProtection",
        "options":  [
            {
                "nameResourceKey":  "anyAppOptionText",
                "descriptionResourceKey":  "",
                "value":  "allApps"
            },
            {
                "nameResourceKey":  "policyManagedAppsOptionText",
                "descriptionResourceKey":  "",
                "value":  "managedApps"
            },
            {
                "nameResourceKey":  "policyManagedAppsWithPasteInOptionText",
                "descriptionResourceKey":  "",
                "value":  "managedAppsWithPasteIn"
            },
            {
                "nameResourceKey":  "blockedOptionText",
                "descriptionResourceKey":  "",
                "value":  "blocked"
            }
        ]
    },
    {
        "nameResourceKey":  "cCPExceptionLabel",
        "descriptionResourceKey":  "",
        "entityKey":  "allowedOutboundClipboardSharingExceptionLength",
        "dataType":  14,
        "category": "SettingDetails.dataProtection"
    },
    {
        "nameResourceKey":  "TAPSettings.ThirdPartyKeyboards.label",
        "descriptionResourceKey":  "TAPSettings.ThirdPartyKeyboards.tooltip",
        "entityKey":  "thirdPartyKeyboardsBlocked",
        "dataType":  0,
        "booleanActions":  100,
        "category": "SettingDetails.dataProtection",
        "childSettings": [
        ]
    },
    {
        "dataType":  8,
        "nameResourceKey":  "encryption"
    }, 
    {
        "nameResourceKey":  "TAPSettings.EncryptData.label",
        "descriptionResourceKey":  "TAPSettings.EncryptData.tooltip",
        "entityKey":  "encryptOrgData",
        "dataType":  0,
        "booleanActions":  101,
        "category": "SettingDetails.dataProtection",
        "childSettings": [
        ]
    },
    {
        "dataType":  8,
        "nameResourceKey":  "functionality"
    }, 
    {
        "nameResourceKey":  "TAPSettings.SyncContacts.label",
        "descriptionResourceKey":  "",
        "entityKey":  "contactSyncBlocked",
        "dataType":  0,
        "booleanActions":  100,
        "category": "SettingDetails.dataProtection",
        "childSettings": [
        ]
    },
    {
        "nameResourceKey":  "TAPSettings.Printing.label",
        "descriptionResourceKey":  "TAPSettings.Printing.tooltip",
        "entityKey":  "printBlocked",
        "dataType":  0,
        "booleanActions":  100,
        "category": "SettingDetails.dataProtection",
        "childSettings": [
        ]
    },
    {
        "nameResourceKey":  "TAPSettings.OpenLinksManagedBrowser.label",
        "descriptionResourceKey":  "TAPSettings.OpenLinksManagedBrowser.tooltip",
        "entityKey":  "managedBrowserSelection",
        "dataType":  16,
        "booleanActions":  0,
        "category": "SettingDetails.dataProtection",
        "options":  [
            {
                "nameResourceKey":  "anyAppOptionText",
                "descriptionResourceKey":  "",
                "value":  "notConfigured"
            },
            {
                "nameResourceKey":  "microsoftEdgeOptionText",
                "descriptionResourceKey":  "",
                "value":  "microsoftEdge"
            },
            {
                "nameResourceKey":  "unmanagedBrowserOptionText",
                "descriptionResourceKey":  "",
                "value":  "unmanagedBrowser"
            }
        ]
    },
    {
        "nameResourceKey":  "TAPSettings.CustomBrowserProtocol.label",
        "descriptionResourceKey":  "TAPSettings.CustomBrowserProtocol.tooltip",
        "entityKey":  "customBrowserProtocol",
        "dataType":  20,
        "booleanActions":  0,
        "category": "SettingDetails.dataProtection"
    },
    {
        "nameResourceKey":  "TAPSettings.NotificationRestriction.label",
        "descriptionResourceKey":  "TAPSettings.NotificationRestriction.tooltip",
        "entityKey":  "notificationRestriction",
        "dataType":  16,
        "booleanActions":  0,
        "category": "SettingDetails.dataProtection",
        "options":  [
            {
                "nameResourceKey":  "allowOption",
                "descriptionResourceKey":  "",
                "value":  "allow"
            },
            {
                "nameResourceKey":  "blockOrgDataOptionText",
                "descriptionResourceKey":  "",
                "value":  "blockOrganizationalData"
            },
            {
                "nameResourceKey":  "blockOption",
                "descriptionResourceKey":  "",
                "value":  "block"
            }
        ]
    },
    {
        "dataType":  8,
        "nameResourceKey":  "empty"
    }, 
    {
        "nameResourceKey":  "TAPSettings.PinAccess.label",
        "descriptionResourceKey":  "TAPSettings.PinAccess.tooltip",
        "entityKey":  "pinRequired",
        "dataType":  0,
        "booleanActions":  101,
        "category": "SettingDetails.accessRequirements"
    },
    {
        "nameResourceKey":  "TAPSettings.PinType.label",
        "descriptionResourceKey":  "TAPSettings.PinType.tooltip",
        "entityKey":  "pinCharacterSet",
        "dataType":  16,
        "booleanActions":  0,
        "category": "SettingDetails.accessRequirements",
        "options":  [
            {
                "nameResourceKey":  "numericOption",
                "descriptionResourceKey":  "",
                "value":  "numeric"
            },
            {
                "nameResourceKey":  "alphanumericOption",
                "descriptionResourceKey":  "",
                "value":  "alphanumericAndSymbol"
            }
        ]        
    },
    {
        "nameResourceKey":  "TAPSettings.SimplePin.label",
        "descriptionResourceKey":  "TAPSettings.SimplePin.tooltip",
        "entityKey":  "simplePinBlocked",
        "dataType":  0,
        "booleanActions":  100,
        "category": "SettingDetails.accessRequirements"
    },
    {
        "nameResourceKey":  "TAPSettings.PinLength.label",
        "descriptionResourceKey":  "TAPSettings.PinLength.tooltip",
        "entityKey":  "minimumPinLength",
        "dataType":  14,
        "booleanActions":  0,
        "category": "SettingDetails.accessRequirements"
    },
    {
        "nameResourceKey":  "TAPSettings.AndroidFingerprint.label",
        "descriptionResourceKey":  "TAPSettings.AndroidFingerprint.tooltip",
        "entityKey":  "fingerprintBlocked",
        "dataType":  0,
        "booleanActions":  100,
        "category": "SettingDetails.accessRequirements"
    },
    {
        "nameResourceKey":  "TAPSettings.AndroidOverrideFingerprint.label",
        "descriptionResourceKey":  "",
        "entityKey":  "overrideFingerprint",
        "dataType":  0,
        "booleanActions":  101,
        "category": "SettingDetails.accessRequirements",
        "childSettings": [
        ]
    },
    {
        "nameResourceKey":  "TAPSettings.Timeout.label",
        "descriptionResourceKey":  "",
        "entityKey":  "pinRequiredInsteadOfBiometricTimeout",
        "dataType":  100,
        "booleanActions":  0,
        "category": "SettingDetails.accessRequirements"
    },
    {
        "nameResourceKey":  "TAPSettings.IOSFaceID.label",
        "descriptionResourceKey":  "TAPSettings.IOSFaceID.tooltip",
        "entityKey":  "faceIdBlocked",
        "dataType":  0,
        "booleanActions":  100,
        "category": "SettingDetails.accessRequirements"
    },
    {
        "nameResourceKey":  "TAPSettings.Tap.pinResetAfterNumberOfDays",
        "descriptionResourceKey":  "",
        "entityKey":  "pinReset",
        "dataType":  0,
        "booleanActions":  109,
        "category": "SettingDetails.accessRequirements"
    },
    {
        "nameResourceKey":  "TAPSettings.Tap.numberOfDays",
        "descriptionResourceKey":  "",
        "entityKey":  "periodBeforePinReset",
        "dataType":  100,
        "booleanActions":  0,
        "category": "SettingDetails.accessRequirements"
    },
    {
        "nameResourceKey":  "TAPSettings.AppPIN.label",
        "descriptionResourceKey":  "TAPSettings.AppPIN.tooltip",
        "entityKey":  "disableAppPinIfDevicePinIsSet",
        "dataType":  0,
        "booleanActions":  201,
        "category": "SettingDetails.accessRequirements"
    },
    {
        "nameResourceKey":  "TAPSettings.CredentialsForAccess.label",
        "descriptionResourceKey":  "TAPSettings.CredentialsForAccess.tooltip",
        "entityKey":  "organizationalCredentialsRequired",
        "dataType":  0,
        "booleanActions":  101,
        "category": "SettingDetails.accessRequirements"
    },
    {
        "nameResourceKey":  "TAPSettings.RecheckAccessAfter.label",
        "descriptionResourceKey":  "TAPSettings.RecheckAccessAfter.tooltip",
        "entityKey":  "periodOnlineBeforeAccessCheck",
        "dataType":  100,
        "booleanActions":  0,
        "category": "SettingDetails.accessRequirements"
    },
    {
        "dataType":  8,
        "nameResourceKey":  ""
    },
    {
        "nameResourceKey":  "SettingDetails.conditionalLaunch",
        "descriptionResourceKey":  "",
        "entityKey":  "ConditionalLaunchSettings",
        "dataType":  21,
        "category": "SettingDetails.conditionalLaunch",
        "Columns": [
            {
                "metadata": {
                    "entityKey": "Setting"
                }
            },
            {
                "metadata": {
                    "entityKey": "Value"
                }
            },
            {
                "metadata": {
                    "entityKey": "Action"
                }
            }
        ]
    }
 ]
--- a/Documentation/ObjectInfo/#microsoft.graph.iosUpdateConfiguration.json
+++ b/Documentation/ObjectInfo/#microsoft.graph.iosUpdateConfiguration.json
@@ -1,254 +0,0 @@
 [
    {
        "nameResourceKey":  "SoftwareUpdates.IosUpdatePolicy.Settings.IOSVersion.updateToInstall",
        "descriptionResourceKey":  "",
        "entityKey":  "versionInfo",
        "dataType":  20,
        "booleanActions":  0,
        "category":  "TableHeaders.settings"
    },
    {
        "nameResourceKey":  "SoftwareUpdates.IosUpdatePolicy.Settings.Schedule.label",
        "descriptionResourceKey":  "SoftwareUpdates.IosUpdatePolicy.Settings.Schedule.infoBalloon",
        "entityKey":  "updateScheduleType",
        "dataType":  16,
        "booleanActions":  0,
        "category":  "TableHeaders.settings",
        "options":  [
            {
                "nameResourceKey":  "SoftwareUpdates.IosUpdatePolicy.Settings.Schedule.outsideActiveHours",
                "descriptionResourceKey":  "",
                "value":  "updateOutsideOfActiveHours"
            },
            {
                "nameResourceKey":  "SoftwareUpdates.IosUpdatePolicy.Settings.Schedule.always",
                "descriptionResourceKey":  "",
                "value":  "alwaysUpdate"
            },
            {
                "nameResourceKey":  "SoftwareUpdates.IosUpdatePolicy.Settings.Schedule.duringTimeWindows",
                "descriptionResourceKey":  "",
                "value":  "updateDuringTimeWindows"
            },
            {
                "nameResourceKey":  "SoftwareUpdates.IosUpdatePolicy.Settings.Schedule.outsideTimeWindows",
                "descriptionResourceKey":  "",
                "value":  "updateOutsideOfTimeWindows"
            }
        ]            
    },
    {
        "dataType":  16,
        "category":  "TableHeaders.settings",
        "nameResourceKey":  "timeZoneName",
        "descriptionResourceKey":  "timeZoneDescription",
        "childSettings":  [
                          ],
        "options":  [
                        {
                            "nameResourceKey":  "utcMinusTwelveOption",
                            "value":  -720,
                            "enabled":  true
                        },
                        {
                            "nameResourceKey":  "utcMinusElevenOption",
                            "value":  -660,
                            "enabled":  true
                        },
                        {
                            "nameResourceKey":  "utcMinusTenOption",
                            "value":  -600,
                            "enabled":  true
                        },
                        {
                            "nameResourceKey":  "utcMinusNineThirtyOption",
                            "value":  -570,
                            "enabled":  true
                        },
                        {
                            "nameResourceKey":  "utcMinusNineOption",
                            "value":  -540,
                            "enabled":  true
                        },
                        {
                            "nameResourceKey":  "utcMinusEightOption",
                            "value":  -480,
                            "enabled":  true
                        },
                        {
                            "nameResourceKey":  "utcMinusSevenOption",
                            "value":  -420,
                            "enabled":  true
                        },
                        {
                            "nameResourceKey":  "utcMinusSixOption",
                            "value":  -360,
                            "enabled":  true
                        },
                        {
                            "nameResourceKey":  "utcMinusFiveOption",
                            "value":  -300,
                            "enabled":  true
                        },
                        {
                            "nameResourceKey":  "utcMinusFourOption",
                            "value":  -240,
                            "enabled":  true
                        },
                        {
                            "nameResourceKey":  "utcMinusThreeThirtyOption",
                            "value":  -210,
                            "enabled":  true
                        },
                        {
                            "nameResourceKey":  "utcMinusThreeOption",
                            "value":  -180,
                            "enabled":  true
                        },
                        {
                            "nameResourceKey":  "utcMinusTwoOption",
                            "value":  -120,
                            "enabled":  true
                        },
                        {
                            "nameResourceKey":  "utcMinusOneOption",
                            "value":  -60,
                            "enabled":  true
                        },
                        {
                            "nameResourceKey":  "utcZeroOption",
                            "value":  0,
                            "enabled":  true
                        },
                        {
                            "nameResourceKey":  "utcPlusOneOption",
                            "value":  60,
                            "enabled":  true
                        },
                        {
                            "nameResourceKey":  "utcPlusTwoOption",
                            "value":  120,
                            "enabled":  true
                        },
                        {
                            "nameResourceKey":  "utcPlusThreeOption",
                            "value":  180,
                            "enabled":  true
                        },
                        {
                            "nameResourceKey":  "utcPlusThreeThirtyOption",
                            "value":  210,
                            "enabled":  true
                        },
                        {
                            "nameResourceKey":  "utcPlusFourOption",
                            "value":  240,
                            "enabled":  true
                        },
                        {
                            "nameResourceKey":  "utcPlusFourThirtyOption",
                            "value":  270,
                            "enabled":  true
                        },
                        {
                            "nameResourceKey":  "utcPlusFiveOption",
                            "value":  300,
                            "enabled":  true
                        },
                        {
                            "nameResourceKey":  "utcPlusFiveThirtyOption",
                            "value":  330,
                            "enabled":  true
                        },
                        {
                            "nameResourceKey":  "utcPlusFiveFourtyFiveOption",
                            "value":  345,
                            "enabled":  true
                        },
                        {
                            "nameResourceKey":  "utcPlusSixOption",
                            "value":  360,
                            "enabled":  true
                        },
                        {
                            "nameResourceKey":  "utcPlusSixThirtyOption",
                            "value":  390,
                            "enabled":  true
                        },
                        {
                            "nameResourceKey":  "utcPlusSevenOption",
                            "value":  420,
                            "enabled":  true
                        },
                        {
                            "nameResourceKey":  "utcPlusEightOption",
                            "value":  480,
                            "enabled":  true
                        },
                        {
                            "nameResourceKey":  "utcPlusEightThirtyOption",
                            "value":  510,
                            "enabled":  true
                        },
                        {
                            "nameResourceKey":  "utcPlusEightFourtyFiveOption",
                            "value":  525,
                            "enabled":  true
                        },
                        {
                            "nameResourceKey":  "utcPlusNineOption",
                            "value":  540,
                            "enabled":  true
                        },
                        {
                            "nameResourceKey":  "utcPlusTenOption",
                            "value":  600,
                            "enabled":  true
                        },
                        {
                            "nameResourceKey":  "utcPlusTenThirtyOption",
                            "value":  630,
                            "enabled":  true
                        },
                        {
                            "nameResourceKey":  "utcPlusElevenOption",
                            "value":  660,
                            "enabled":  true
                        },
                        {
                            "nameResourceKey":  "utcPlusTwelveOption",
                            "value":  720,
                            "enabled":  true
                        },
                        {
                            "nameResourceKey":  "utcPlusTwelveFourtyFiveOption",
                            "value":  765,
                            "enabled":  true
                        },
                        {
                            "nameResourceKey":  "utcPlusThirteenOption",
                            "value":  780,
                            "enabled":  true
                        },
                        {
                            "nameResourceKey":  "utcPlusFourteenOption",
                            "value":  840,
                            "enabled":  true
                        }
                    ],
        "entityKey":  "utcTimeOffsetInMinutes",
        "booleanActions":  0,
        "defaultValue":  0,
        "policyType":  51,
        "enabled":  true
    },
    {
        "nameResourceKey":  "timeWindowName",
        "descriptionResourceKey":  "",
        "entityKey":  "timeWidows",
        "dataType":  20,
        "booleanActions":  0,
        "category":  "TableHeaders.settings"
    }
 ]
--- a/Documentation/ObjectInfo/#microsoft.graph.mdmWindowsInformationProtectionPolicy.json
+++ b/Documentation/ObjectInfo/#microsoft.graph.mdmWindowsInformationProtectionPolicy.json
@@ -1,375 +0,0 @@
 [
    {
        "nameResourceKey":  "TableHeaders.policyType",
        "descriptionResourceKey":  "",
        "entityKey":  "SettingDetails.appProtectionPolicy",
        "dataType":  200,
        "booleanActions":  0,
        "category": 1000
    },
    {
        "nameResourceKey":  "SettingDetails.platformSupported",
        "descriptionResourceKey":  "",
        "entityKey":  "AppProtection.windows10PlatformLabel",
        "dataType":  200,
        "booleanActions":  0,
        "category": 1000
    },
    {
        "nameResourceKey":  "WipPolicySettings.enrollmentState",
        "descriptionResourceKey":  "",
        "entityKey":  "WipPolicySettings.withEnrollment",
        "dataType":  200,
        "booleanActions":  0,
        "category": 1000
    },
    {
        "nameResourceKey":  "wipPolicyProtectedAppsTitle",
        "descriptionResourceKey":  "",
        "entityKey":  "protectedApps",
        "dataType":  21,
        "category": "SettingDetails.policyAppsTargetedTitle",
        "Columns": [
            {
                "metadata": {
                    "entityKey": "displayName"
                }
            },
            {
                "metadata": {
                    "entityKey": "productName"
                }
            },
            {
                "metadata": {
                    "entityKey": "publisherName"
                }
            },
            {
                "metadata": {
                    "entityKey": "denied"
                }
            }
        ]
    },
    {
        "nameResourceKey":  "wipPolicyExemptAppsTitle",
        "descriptionResourceKey":  "",
        "entityKey":  "exemptAppLockerFiles",
        "dataType":  21,
        "category": "SettingDetails.policyAppsTargetedTitle",
        "Columns": [
            {
                "metadata": {
                    "entityKey": "displayName"
                }
            },
            {
                "metadata": {
                    "entityKey": "productName"
                }
            },
            {
                "metadata": {
                    "entityKey": "publisherName"
                }
            },
            {
                "metadata": {
                    "entityKey": "denied"
                }
            }
        ]
    },
    {
        "nameResourceKey":  "WipPolicySettings.wipProtectionMode",
        "descriptionResourceKey":  "",
        "entityKey":  "enforcementLevel",
        "dataType":  16,
        "booleanActions":  0,
        "category": "SettingDetails.requiredSettings",
        "options":  [
            {
                "nameResourceKey":  "offOption",
                "descriptionResourceKey":  "",
                "value":  "noProtection"
            },
            {
                "nameResourceKey":  "silent",
                "descriptionResourceKey":  "",
                "value":  "encryptAndAuditOnly"
            },
            {
                "nameResourceKey":  "allowOverrides",
                "descriptionResourceKey":  "",
                "value":  "encryptAuditAndPrompt"
            },
            {
                "nameResourceKey":  "block",
                "descriptionResourceKey":  "",
                "value":  "encryptAuditAndBlock"
            }
        ]            
    },
    {
        "nameResourceKey":  "WipPolicySettings.corporateIdentity",
        "descriptionResourceKey":  "wipCorpIdentityTooltip",
        "entityKey":  "enterpriseDomain",
        "dataType":  20,
        "booleanActions":  0,
        "category": "SettingDetails.requiredSettings"
    },
    {
        "nameResourceKey":  "networkPerimeter",
        "descriptionResourceKey":  "",
        "dataType":  8,
        "booleanActions":  0
    },
    {
        "nameResourceKey":  "WipPolicySettings.protectedDomainNames",
        "descriptionResourceKey":  "",
        "entityKey":  "enterpriseProtectedDomainNames",
        "dataType":  21,
        "category": "SettingDetails.advancedSettings",
        "Columns": [
            {
                "metadata": {
                    "entityKey": "displayName"
                }
            },
            {
                "metadata": {
                    "entityKey": "resources"
                }
            }
        ]
    },
    {
        "nameResourceKey":  "WipPolicySettings.proxyServers",
        "descriptionResourceKey":  "",
        "entityKey":  "enterpriseProxyServers",
        "dataType":  21,
        "category": "SettingDetails.advancedSettings",
        "Columns": [
            {
                "metadata": {
                    "entityKey": "displayName"
                }
            },
            {
                "metadata": {
                    "entityKey": "resources"
                }
            }
        ]
    },
    {
        "nameResourceKey":  "WipPolicySettings.internalProxyServers",
        "descriptionResourceKey":  "",
        "entityKey":  "enterpriseInternalProxyServers",
        "dataType":  21,
        "category": "SettingDetails.advancedSettings",
        "Columns": [
            {
                "metadata": {
                    "entityKey": "displayName"
                }
            },
            {
                "metadata": {
                    "entityKey": "resources"
                }
            }
        ]
    },
    {
        "nameResourceKey":  "WipPolicySettings.iPv4Ranges",
        "descriptionResourceKey":  "",
        "entityKey":  "enterpriseIPRanges",
        "dataType":  21,
        "category": "SettingDetails.advancedSettings",
        "Columns": [
            {
                "metadata": {
                    "entityKey": "displayName"
                }
            },
            {
                "metadata": {
                    "entityKey": "ranges"
                }
            }
        ]
    },
    {
        "nameResourceKey":  "WipPolicySettings.networkDomainNames",
        "descriptionResourceKey":  "",
        "entityKey":  "enterpriseNetworkDomainNames",
        "dataType":  21,
        "category": "SettingDetails.advancedSettings",
        "Columns": [
            {
                "metadata": {
                    "entityKey": "displayName"
                }
            },
            {
                "metadata": {
                    "entityKey": "resources"
                }
            }
        ]
    },
    {
        "nameResourceKey":  "WipPolicySettings.neutralResources",
        "descriptionResourceKey":  "",
        "entityKey":  "neutralDomainResources",
        "dataType":  21,
        "category": "SettingDetails.advancedSettings",
        "Columns": [
            {
                "metadata": {
                    "entityKey": "displayName"
                }
            },
            {
                "metadata": {
                    "entityKey": "resources"
                }
            }
        ]
    },
    {
        "nameResourceKey":  "WipPolicySettings.cloudResources",
        "descriptionResourceKey":  "",
        "entityKey":  "enterpriseProxiedDomains",
        "dataType":  21,
        "category": "SettingDetails.advancedSettings",
        "Columns": [
            {
                "metadata": {
                    "entityKey": "displayName"
                }
            },
            {
                "metadata": {
                    "entityKey": "proxiedDomains"
                }
            }
        ]
    },
    {
        "nameResourceKey":  "WipPolicySettings.authoritativeProxyServers",
        "descriptionResourceKey":  "Tooltips.WipPolicySettings.authoritativeProxyServers",
        "entityKey":  "enterpriseProxyServersAreAuthoritative",
        "dataType":  0,
        "booleanActions":  120,
        "category": "SettingDetails.advancedSettings"
    },
    {
        "nameResourceKey":  "WipPolicySettings.authoritativeIpRanges",
        "descriptionResourceKey":  "Tooltips.WipPolicySettings.authoritativeIpRanges",
        "entityKey":  "enterpriseIPRangesAreAuthoritative",
        "dataType":  0,
        "booleanActions":  120,
        "category": "SettingDetails.advancedSettings"
    },
    {
        "nameResourceKey":  "dataProtection",
        "descriptionResourceKey":  "",
        "dataType":  8,
        "booleanActions":  0
    },
    {
        "nameResourceKey":  "WipPolicySettings.dataRecoveryCert",
        "descriptionResourceKey":  "Tooltips.WipPolicySettings.dataRecoveryCert",
        "entityKey":  "dataRecoveryCertificate",
        "dataType":  21,
        "booleanActions":  0,
        "category": "SettingDetails.advancedSettings",
        "Columns": [
            {
                "metadata": {
                    "entityKey": "description"
                }
            }
        ]
    },
    {
        "nameResourceKey":  "WipPolicySettings.protectUnderLock",
        "descriptionResourceKey":  "Tooltips.WipPolicySettings.protectUnderLock",
        "entityKey":  "protectionUnderLockConfigRequired",
        "dataType":  0,
        "booleanActions":  120,
        "category": "SettingDetails.advancedSettings"
    },
    {
        "nameResourceKey":  "WipPolicySettings.revokeOnUnenroll",
        "descriptionResourceKey":  "Tooltips.WipPolicySettings.revokeOnUnenroll",
        "entityKey":  "revokeOnUnenrollDisabled",
        "dataType":  0,
        "booleanActions":  220,
        "category": "SettingDetails.advancedSettings"
    },
    {
        "nameResourceKey":  "WipPolicySettings.revokeOnMdmHandoff",
        "descriptionResourceKey":  "Tooltips.WipPolicySettings.revokeOnMdmHandoff",
        "entityKey":  "revokeOnMdmHandoffDisabled",
        "dataType":  0,
        "booleanActions":  220,
        "category": "SettingDetails.advancedSettings"
    },
    {
        "nameResourceKey":  "WipPolicySettings.showWipIcon",
        "descriptionResourceKey":  "Tooltips.WipPolicySettings.showWipIcon",
        "entityKey":  "iconsVisible",
        "dataType":  0,
        "booleanActions":  120,
        "category": "SettingDetails.advancedSettings"
    },
    {
        "nameResourceKey":  "WipPolicySettings.useRmsForWip",
        "descriptionResourceKey":  "Tooltips.WipPolicySettings.useRmsForWip",
        "entityKey":  "azureRightsManagementServicesAllowed",
        "dataType":  0,
        "booleanActions":  120,
        "category": "SettingDetails.advancedSettings"
    },
    {
        "nameResourceKey":  "WipPolicySettings.rmsTemplateForEdp",
        "descriptionResourceKey":  "Tooltips.WipPolicySettings.rmsTemplateForEdp",
        "entityKey":  "rightsManagementServicesTemplateId",
        "dataType":  20,
        "booleanActions":  0,
        "category": "SettingDetails.advancedSettings"
    },
    {
        "nameResourceKey":  "wipAllowIndexingTitle",
        "descriptionResourceKey":  "",
        "entityKey":  "indexingEncryptedStoresOrItemsBlocked",
        "dataType":  0,
        "booleanActions":  220,
        "category": "SettingDetails.advancedSettings"
    },    
    {
        "nameResourceKey":  "wipSMBStringListTitle",
        "descriptionResourceKey":  "",
        "entityKey":  "smbAutoEncryptedFileExtensions",
        "dataType":  21,
        "category": "SettingDetails.advancedSettings",
        "Columns": [
            {
                "metadata": {
                    "entityKey": "displayName"
                }
            },
            {
                "metadata": {
                    "entityKey": "resources"
                }
            }
        ]
    }
 ]
--- a/Documentation/ObjectInfo/#microsoft.graph.windows10EnrollmentCompletionPageConfiguration.json
+++ b/Documentation/ObjectInfo/#microsoft.graph.windows10EnrollmentCompletionPageConfiguration.json
@@ -1,136 +0,0 @@
 [
    {
        "nameResourceKey":  "TableHeaders.policyType",
        "descriptionResourceKey":  "",
        "entityKey":  "WindowsEnrollment.enrollmentStatusPage",
        "dataType":  200,
        "booleanActions":  0,
        "category": 1000
    },
    {
        "nameResourceKey":  "EnrollmentStatusScreen.progressToggle",
        "descriptionResourceKey":  "",
        "entityKey":  "showInstallationProgress",
        "dataType":  16,
        "booleanActions":  109,
        "category":  "TableHeaders.settings",
        "options":  [                                
            {
                "nameResourceKey":  "SettingDetails.no",
                "value":  "false"
            },
            {
                "nameResourceKey":  "BooleanActions.yes",
                "value":  "true",
                "Children": [
                    {
                        "nameResourceKey":  "EnrollmentStatusScreen.timeout",
                        "descriptionResourceKey":  "",
                        "entityKey":  "InstallProgressTimeout",
                        "dataType":  14,
                        "booleanActions":  0,
                        "category":  "TableHeaders.settings"
                    },
                    {
                        "nameResourceKey":  "EnrollmentStatusScreen.customMessageToggle",
                        "descriptionResourceKey":  "",
                        "entityKey":  "showCustomErrorMessage",
                        "dataType":  16,
                        "booleanActions":  109,
                        "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":  "TableHeaders.settings"
                                    }
                                ]
                            }
                        ]
                    },
                    {
                        "nameResourceKey":  "EnrollmentStatusScreen.collectLogToggle",
                        "descriptionResourceKey":  "",
                        "entityKey":  "allowLogCollectionOnInstallFailure",
                        "dataType":  0,
                        "booleanActions":  109,
                        "category":  "TableHeaders.settings"
                    },
                    {
                        "nameResourceKey":  "EnrollmentStatusScreen.enableForAutopilotOnlyToggle",
                        "descriptionResourceKey":  "",
                        "entityKey":  "trackInstallProgressForAutopilotOnly",
                        "dataType":  0,
                        "booleanActions":  109,
                        "category":  "TableHeaders.settings"
                    },
                    {
                        "nameResourceKey":  "EnrollmentStatusScreen.blockToggle",
                        "descriptionResourceKey":  "",
                        "entityKey":  "blockDeviceSetupRetryByUser",
                        "dataType":  16,
                        "booleanActions":  0,
                        "category":  "TableHeaders.settings",
                        "options":  [                                
                            {
                                "nameResourceKey":  "SettingDetails.no",
                                "value":  "true"
                            },
                            {
                                "nameResourceKey":  "BooleanActions.yes",
                                "value":  "false",
                                "Children": [
                                    {
                                        "nameResourceKey":  "EnrollmentStatusScreen.resetToggle",
                                        "descriptionResourceKey":  "",
                                        "entityKey":  "allowDeviceResetOnInstallFailure",
                                        "dataType":  0,
                                        "booleanActions":  109,
                                        "category":  "TableHeaders.settings"
                                    },
                                    {
                                        "nameResourceKey":  "EnrollmentStatusScreen.allowToUseToggle",
                                        "descriptionResourceKey":  "",
                                        "entityKey":  "allowDeviceUseOnInstallFailure",
                                        "dataType":  0,
                                        "booleanActions":  109,
                                        "category":  "TableHeaders.settings"
                                    },
                                    {
                                        "nameResourceKey":  "EnrollmentStatusScreen.Apps.useSelectedAppsToggleLabel",
                                        "descriptionResourceKey":  "",
                                        "entityKey":  "waitForApps",
                                        "dataType":  14,
                                        "booleanActions":  0,
                                        "category":  "TableHeaders.settings",
                                        "Children": [
                                            {
                                                "nameResourceKey":  "EnrollmentStatusScreen.Apps.allowNonBlockingAppInstallation",
                                                "descriptionResourceKey":  "",
                                                "entityKey":  "allowNonBlockingAppInstallation",
                                                "dataType":  0,
                                                "booleanActions":  109,
                                                "category":  "TableHeaders.settings"
                                            }
                                        ] 
                                    }
                                ]
                            }
                        ]        
                    }
                ]
            }
        ]
    }
 ]
--- a/Documentation/ObjectInfo/#microsoft.graph.windowsDriverUpdateProfile.json
+++ b/Documentation/ObjectInfo/#microsoft.graph.windowsDriverUpdateProfile.json
@@ -1,69 +0,0 @@
 [
    {
        "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"
                }
            ]
        }
    }
 ]
--- a/Documentation/ObjectInfo/#microsoft.graph.windowsFeatureUpdateProfile.json
+++ b/Documentation/ObjectInfo/#microsoft.graph.windowsFeatureUpdateProfile.json
@@ -1,107 +0,0 @@
 [
    {
        "nameResourceKey":  "TableHeaders.policyType",
        "descriptionResourceKey":  "",
        "entityKey":  "Titles.featureUpdateDeployments",
        "dataType":  200,
        "booleanActions":  0,
        "category": 1000
    },
    {
        "nameResourceKey":  "WindowsFeatureUpdateProfile.Details.FeatureUpdateVersion.label",
        "descriptionResourceKey":  "WindowsFeatureUpdateProfile.Details.FeatureUpdateVersion.infoballoon",
        "entityKey":  "featureUpdateDisplayName",
        "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
                    }
                ]
            }
        ]
    }    
 ]
--- a/Documentation/ObjectInfo/#microsoft.graph.windowsInformationProtectionPolicy.json
+++ b/Documentation/ObjectInfo/#microsoft.graph.windowsInformationProtectionPolicy.json
@@ -1,526 +0,0 @@
 [
    {
        "nameResourceKey":  "TableHeaders.policyType",
        "descriptionResourceKey":  "",
        "entityKey":  "SettingDetails.appProtectionPolicy",
        "dataType":  200,
        "booleanActions":  0,
        "category": 1000
    },
    {
        "nameResourceKey":  "SettingDetails.platformSupported",
        "descriptionResourceKey":  "",
        "entityKey":  "AppProtection.windows10PlatformLabel",
        "dataType":  200,
        "booleanActions":  0,
        "category": 1000
    },
    {
        "nameResourceKey":  "WipPolicySettings.enrollmentState",
        "descriptionResourceKey":  "",
        "entityKey":  "WipPolicySettings.withoutEnrollment",
        "dataType":  200,
        "booleanActions":  0,
        "category": 1000
    },
    {
        "nameResourceKey":  "wipPolicyProtectedAppsTitle",
        "descriptionResourceKey":  "",
        "entityKey":  "protectedApps",
        "dataType":  21,
        "category": "SettingDetails.policyAppsTargetedTitle",
        "Columns": [
            {
                "metadata": {
                    "entityKey": "displayName"
                }
            },
            {
                "metadata": {
                    "entityKey": "productName"
                }
            },
            {
                "metadata": {
                    "entityKey": "publisherName"
                }
            },
            {
                "metadata": {
                    "entityKey": "denied"
                }
            }
        ]
    },
    {
        "nameResourceKey":  "wipPolicyExemptAppsTitle",
        "descriptionResourceKey":  "",
        "entityKey":  "exemptAppLockerFiles",
        "dataType":  21,
        "category": "SettingDetails.policyAppsTargetedTitle",
        "Columns": [
            {
                "metadata": {
                    "entityKey": "displayName"
                }
            },
            {
                "metadata": {
                    "entityKey": "productName"
                }
            },
            {
                "metadata": {
                    "entityKey": "publisherName"
                }
            },
            {
                "metadata": {
                    "entityKey": "denied"
                }
            }
        ]
    },
    {
        "nameResourceKey":  "WipPolicySettings.wipProtectionMode",
        "descriptionResourceKey":  "",
        "entityKey":  "enforcementLevel",
        "dataType":  16,
        "booleanActions":  0,
        "category": "SettingDetails.requiredSettings",
        "options":  [
            {
                "nameResourceKey":  "offOption",
                "descriptionResourceKey":  "",
                "value":  "noProtection"
            },
            {
                "nameResourceKey":  "silent",
                "descriptionResourceKey":  "",
                "value":  "encryptAndAuditOnly"
            },
            {
                "nameResourceKey":  "allowOverrides",
                "descriptionResourceKey":  "",
                "value":  "encryptAuditAndPrompt"
            },
            {
                "nameResourceKey":  "block",
                "descriptionResourceKey":  "",
                "value":  "encryptAuditAndBlock"
            }
        ]            
    },
    {
        "nameResourceKey":  "WipPolicySettings.corporateIdentity",
        "descriptionResourceKey":  "wipCorpIdentityTooltip",
        "entityKey":  "enterpriseDomain",
        "dataType":  20,
        "booleanActions":  0,
        "category": "SettingDetails.requiredSettings"
    },
    {
        "nameResourceKey":  "networkPerimeter",
        "descriptionResourceKey":  "",
        "dataType":  8,
        "booleanActions":  0
    },
    {
        "nameResourceKey":  "WipPolicySettings.protectedDomainNames",
        "descriptionResourceKey":  "",
        "entityKey":  "enterpriseProtectedDomainNames",
        "dataType":  21,
        "category": "SettingDetails.advancedSettings",
        "Columns": [
            {
                "metadata": {
                    "entityKey": "displayName"
                }
            },
            {
                "metadata": {
                    "entityKey": "resources"
                }
            }
        ]
    },
    {
        "nameResourceKey":  "WipPolicySettings.proxyServers",
        "descriptionResourceKey":  "",
        "entityKey":  "enterpriseProxyServers",
        "dataType":  21,
        "category": "SettingDetails.advancedSettings",
        "Columns": [
            {
                "metadata": {
                    "entityKey": "displayName"
                }
            },
            {
                "metadata": {
                    "entityKey": "resources"
                }
            }
        ]
    },
    {
        "nameResourceKey":  "WipPolicySettings.internalProxyServers",
        "descriptionResourceKey":  "",
        "entityKey":  "enterpriseInternalProxyServers",
        "dataType":  21,
        "category": "SettingDetails.advancedSettings",
        "Columns": [
            {
                "metadata": {
                    "entityKey": "displayName"
                }
            },
            {
                "metadata": {
                    "entityKey": "resources"
                }
            }
        ]
    },
    {
        "nameResourceKey":  "WipPolicySettings.iPv4Ranges",
        "descriptionResourceKey":  "",
        "entityKey":  "enterpriseIPRanges",
        "dataType":  21,
        "category": "SettingDetails.advancedSettings",
        "Columns": [
            {
                "metadata": {
                    "entityKey": "displayName"
                }
            },
            {
                "metadata": {
                    "entityKey": "ranges"
                }
            }
        ]
    },
    {
        "nameResourceKey":  "WipPolicySettings.networkDomainNames",
        "descriptionResourceKey":  "",
        "entityKey":  "enterpriseNetworkDomainNames",
        "dataType":  21,
        "category": "SettingDetails.advancedSettings",
        "Columns": [
            {
                "metadata": {
                    "entityKey": "displayName"
                }
            },
            {
                "metadata": {
                    "entityKey": "resources"
                }
            }
        ]
    },
    {
        "nameResourceKey":  "WipPolicySettings.neutralResources",
        "descriptionResourceKey":  "",
        "entityKey":  "neutralDomainResources",
        "dataType":  21,
        "category": "SettingDetails.advancedSettings",
        "Columns": [
            {
                "metadata": {
                    "entityKey": "displayName"
                }
            },
            {
                "metadata": {
                    "entityKey": "resources"
                }
            }
        ]
    },
    {
        "nameResourceKey":  "WipPolicySettings.cloudResources",
        "descriptionResourceKey":  "",
        "entityKey":  "enterpriseProxiedDomains",
        "dataType":  21,
        "category": "SettingDetails.advancedSettings",
        "Columns": [
            {
                "metadata": {
                    "entityKey": "displayName"
                }
            },
            {
                "metadata": {
                    "entityKey": "proxiedDomains"
                }
            }
        ]
    },
    {
        "nameResourceKey":  "WipPolicySettings.authoritativeProxyServers",
        "descriptionResourceKey":  "Tooltips.WipPolicySettings.authoritativeProxyServers",
        "entityKey":  "enterpriseProxyServersAreAuthoritative",
        "dataType":  0,
        "booleanActions":  120,
        "category": "SettingDetails.advancedSettings"
    },
    {
        "nameResourceKey":  "WipPolicySettings.authoritativeIpRanges",
        "descriptionResourceKey":  "Tooltips.WipPolicySettings.authoritativeIpRanges",
        "entityKey":  "enterpriseIPRangesAreAuthoritative",
        "dataType":  0,
        "booleanActions":  120,
        "category": "SettingDetails.advancedSettings"
    },
    {
        "nameResourceKey":  "dataProtection",
        "descriptionResourceKey":  "",
        "dataType":  8,
        "booleanActions":  0
    },
    {
        "nameResourceKey":  "WipPolicySettings.dataRecoveryCert",
        "descriptionResourceKey":  "Tooltips.WipPolicySettings.dataRecoveryCert",
        "entityKey":  "dataRecoveryCertificate",
        "dataType":  21,
        "booleanActions":  0,
        "category": "SettingDetails.advancedSettings",
        "Columns": [
            {
                "metadata": {
                    "entityKey": "description"
                }
            }
        ]
    },
    {
        "nameResourceKey":  "WipPolicySettings.protectUnderLock",
        "descriptionResourceKey":  "Tooltips.WipPolicySettings.protectUnderLock",
        "entityKey":  "protectionUnderLockConfigRequired",
        "dataType":  0,
        "booleanActions":  120,
        "category": "SettingDetails.advancedSettings"
    },
    {
        "nameResourceKey":  "WipPolicySettings.revokeOnUnenroll",
        "descriptionResourceKey":  "Tooltips.WipPolicySettings.revokeOnUnenroll",
        "entityKey":  "revokeOnUnenrollDisabled",
        "dataType":  0,
        "booleanActions":  220,
        "category": "SettingDetails.advancedSettings"
    },
    {
        "nameResourceKey":  "WipPolicySettings.revokeOnMdmHandoff",
        "descriptionResourceKey":  "Tooltips.WipPolicySettings.revokeOnMdmHandoff",
        "entityKey":  "revokeOnMdmHandoffDisabled",
        "dataType":  0,
        "booleanActions":  220,
        "category": "SettingDetails.advancedSettings"
    },
    {
        "nameResourceKey":  "WipPolicySettings.showWipIcon",
        "descriptionResourceKey":  "Tooltips.WipPolicySettings.showWipIcon",
        "entityKey":  "iconsVisible",
        "dataType":  0,
        "booleanActions":  120,
        "category": "SettingDetails.advancedSettings"
    },
    {
        "nameResourceKey":  "WipPolicySettings.useRmsForWip",
        "descriptionResourceKey":  "Tooltips.WipPolicySettings.useRmsForWip",
        "entityKey":  "azureRightsManagementServicesAllowed",
        "dataType":  0,
        "booleanActions":  120,
        "category": "SettingDetails.advancedSettings"
    },
    {
        "nameResourceKey":  "WipPolicySettings.rmsTemplateForEdp",
        "descriptionResourceKey":  "Tooltips.WipPolicySettings.rmsTemplateForEdp",
        "entityKey":  "rightsManagementServicesTemplateId",
        "dataType":  20,
        "booleanActions":  0,
        "category": "SettingDetails.advancedSettings"
    },
    {
        "nameResourceKey":  "wipAllowIndexingTitle",
        "descriptionResourceKey":  "",
        "entityKey":  "indexingEncryptedStoresOrItemsBlocked",
        "dataType":  0,
        "booleanActions":  220,
        "category": "SettingDetails.advancedSettings"
    },
    {
        "nameResourceKey":  "WipPolicySettings.mdmDiscoveryUrl",
        "descriptionResourceKey":  "Tooltips.WipPolicySettings.mdmDiscoveryUrl",
        "entityKey":  "mdmEnrollmentUrl",
        "dataType":  20,
        "booleanActions":  0,
        "category": "SettingDetails.advancedSettings"
    },
    {
        "nameResourceKey":  "wipSMBStringListTitle",
        "descriptionResourceKey":  "",
        "entityKey":  "smbAutoEncryptedFileExtensions",
        "dataType":  21,
        "category": "SettingDetails.advancedSettings",
        "Columns": [
            {
                "metadata": {
                    "entityKey": "displayName"
                }
            },
            {
                "metadata": {
                    "entityKey": "resources"
                }
            }
        ]
    },
    {
        "nameResourceKey":  "timebombLabel",
        "descriptionResourceKey":  "timebombToolTip",
        "entityKey":  "daysWithoutContactBeforeUnenroll",
        "dataType":  14,
        "booleanActions":  0,
        "category": "SettingDetails.advancedSettings"
    },
    {
        "nameResourceKey":  "access",
        "descriptionResourceKey":  "",
        "dataType":  8,
        "booleanActions":  0
    },
    {
        "nameResourceKey":  "WipPolicySettings.passportForWork",
        "descriptionResourceKey":  "Tooltips.WipPolicySettings.passportForWork1",
        "entityKey":  "windowsHelloForBusinessBlocked",
        "dataType":  0,
        "booleanActions":  220,
        "category": "SettingDetails.advancedSettings"
    },
    {
        "nameResourceKey":  "WipPolicySettings.minimumPinLength",
        "descriptionResourceKey":  "",
        "entityKey":  "pinMinimumLength",
        "dataType":  14,
        "booleanActions":  0,
        "category": "SettingDetails.advancedSettings"
    },
    {
        "nameResourceKey":  "WipPolicySettings.pinUppercaseLetters",
        "descriptionResourceKey":  "",
        "entityKey":  "pinUppercaseLetters",
        "dataType":  16,
        "booleanActions":  0,
        "category": "SettingDetails.advancedSettings",
        "options":  [
            {
                "nameResourceKey":  "WIPPinRequirements.WipUppercaseCharacterPinRequirements.notAllow",
                "descriptionResourceKey":  "",
                "value":  "notAllow"
            },
            {
                "nameResourceKey":  "WIPPinRequirements.WipUppercaseCharacterPinRequirements.requireAtLeastOne",
                "descriptionResourceKey":  "",
                "value":  "requireAtLeastOne"
            },
            {
                "nameResourceKey":  "WIPPinRequirements.WipUppercaseCharacterPinRequirements.allow",
                "descriptionResourceKey":  "",
                "value":  "allow"
            }
        ]            
    },
    {
        "nameResourceKey":  "WipPolicySettings.pinLowercaseLetters",
        "descriptionResourceKey":  "",
        "entityKey":  "pinLowercaseLetters",
        "dataType":  16,
        "booleanActions":  0,
        "category": "SettingDetails.advancedSettings",
        "options":  [
            {
                "nameResourceKey":  "WIPPinRequirements.WipLowercaseCharacterPinRequirements.notAllow",
                "descriptionResourceKey":  "",
                "value":  "notAllow"
            },
            {
                "nameResourceKey":  "WIPPinRequirements.WipLowercaseCharacterPinRequirements.requireAtLeastOne",
                "descriptionResourceKey":  "",
                "value":  "requireAtLeastOne"
            },
            {
                "nameResourceKey":  "WIPPinRequirements.WipLowercaseCharacterPinRequirements.allow",
                "descriptionResourceKey":  "",
                "value":  "allow"
            }
        ]            
    },
    {
        "nameResourceKey":  "WipPolicySettings.pinSpecialCharacters",
        "descriptionResourceKey":  "",
        "entityKey":  "pinSpecialCharacters",
        "dataType":  16,
        "booleanActions":  0,
        "category": "SettingDetails.advancedSettings",
        "options":  [
            {
                "nameResourceKey":  "WIPPinRequirements.WipSpecialCharacterPinRequirements.notAllow",
                "descriptionResourceKey":  "",
                "value":  "notAllow"
            },
            {
                "nameResourceKey":  "WIPPinRequirements.WipSpecialCharacterPinRequirements.requireAtLeastOne",
                "descriptionResourceKey":  "",
                "value":  "requireAtLeastOne"
            },
            {
                "nameResourceKey":  "WIPPinRequirements.WipSpecialCharacterPinRequirements.allow",
                "descriptionResourceKey":  "",
                "value":  "allow"
            }
        ]            
    },
    {
        "nameResourceKey":  "WipPolicySettings.pinExpiration",
        "descriptionResourceKey":  "Tooltips.WipPolicySettings.pinExpiration",
        "entityKey":  "pinExpirationDays",
        "dataType":  14,
        "booleanActions":  0,
        "category": "SettingDetails.advancedSettings"
    },
    {
        "nameResourceKey":  "WipPolicySettings.pinHistory",
        "descriptionResourceKey":  "Tooltips.WipPolicySettings.pinHistory1",
        "entityKey":  "numberOfPastPinsRemembered",
        "dataType":  14,
        "booleanActions":  0,
        "category": "SettingDetails.advancedSettings"
    },
    {
        "nameResourceKey":  "WipPolicySettings.maxPasswordAttempts",
        "descriptionResourceKey":  "Tooltips.WipPolicySettings.maxPasswordAttempts1",
        "entityKey":  "passwordMaximumAttemptCount",
        "dataType":  14,
        "booleanActions":  0,
        "category": "SettingDetails.advancedSettings"
    },
    {
        "nameResourceKey":  "WipPolicySettings.maxInactivityTime",
        "descriptionResourceKey":  "Tooltips.WipPolicySettings.maxInactivityTime1",
        "entityKey":  "minutesOfInactivityBeforeDeviceLock",
        "dataType":  14,
        "booleanActions":  0,
        "category": "SettingDetails.advancedSettings"
    }
 ]
--- a/Documentation/ObjectInfo/#microsoft.graph.windowsQualityUpdateProfile.json
+++ b/Documentation/ObjectInfo/#microsoft.graph.windowsQualityUpdateProfile.json
@@ -1,50 +0,0 @@
 [
    {
        "nameResourceKey":  "TableHeaders.policyType",
        "descriptionResourceKey":  "",
        "entityKey":  "Titles.windows10QualityUpdate",
        "dataType":  200,
        "booleanActions":  0,
        "category": 1000
    },
    {
        "nameResourceKey":  "WindowsQualityUpdateProfile.Details.QualityUpdateRelease.label",
        "descriptionResourceKey":  "",
        "entityKey":  "deployableContentDisplayName",
        "dataType":  20,
        "booleanActions":  0,
        "category":  "TableHeaders.settings"
    },
    {
        "nameResourceKey":  "WindowsQualityUpdateProfile.Details.DaysUntilForcedReboot.label",
        "descriptionResourceKey":  "",
        "entityKey":  "expeditedUpdateSettings",
        "dataType":  6,
        "booleanActions":  0,
        "category":  "TableHeaders.settings",
        "complexOptions":  [
            {
                "nameResourceKey":  "WindowsQualityUpdateProfile.Details.DaysUntilForcedReboot.label",
                "descriptionResourceKey":  "",
                "dataType":  16,
                "category":  "TableHeaders.settings",
                "entityKey":  "daysUntilForcedReboot",
                "booleanActions":  0,
                "options":  [                                
                                {
                                    "nameResourceKey":  "WindowsQualityUpdateDaysUntilForcedReboot.zeroDays",
                                    "value":  "0"
                                },
                                {
                                    "nameResourceKey":  "WindowsQualityUpdateDaysUntilForcedReboot.oneDay",
                                    "value":  "1"
                                },
                                {
                                    "nameResourceKey":  "WindowsQualityUpdateDaysUntilForcedReboot.twoDays",
                                    "value":  "2"
                                }
                ]
            }         
        ]
    }  
 ]
--- a/Documentation/ObjectInfo/airprint_iosdevicefeatures.json
+++ b/Documentation/ObjectInfo/airprint_iosdevicefeatures.json
@@ -1,138 +0,0 @@
 {
    "airprint_iosdevicefeatures":  [
                                       {
                                           "isSettingDescription":  false,
                                           "showAsSectionHeader":  false,
                                           "dataType":  8,
                                           "category":  1,
                                           "nameResourceKey":  "IosDeviceFeaturesAirPrintHeader",
                                           "childSettings":  [
                                                             ],
                                           "options":  [
                                                       ],
                                           "booleanActions":  0,
                                           "policyType":  42,
                                           "enabled":  true
                                       },
                                       {
                                           "isSettingDescription":  false,
                                           "showAsSectionHeader":  true,
                                           "dataType":  8,
                                           "category":  1,
                                           "nameResourceKey":  "allEnrollmentTypesHeaderName",
                                           "descriptionResourceKey":  "allEnrollmentTypesHeaderDescription",
                                           "childSettings":  [
                                                                 {
                                                                     "columns":  [
                                                                                     {
                                                                                         "metadata":  {
                                                                                                          "dataType":  20,
                                                                                                          "category":  1,
                                                                                                          "nameResourceKey":  "ipAddress",
                                                                                                          "descriptionResourceKey":  "ipAddressDescription",
                                                                                                          "emptyValueResourceKey":  "airPrintIpAddressHint",
                                                                                                          "childSettings":  [
                                                                                                                            ],
                                                                                                          "options":  [
                                                                                                                      ],
                                                                                                          "entityKey":  "ipAddress",
                                                                                                          "booleanActions":  0,
                                                                                                          "policyType":  42,
                                                                                                          "enabled":  true
                                                                                                      }
                                                                                     },
                                                                                     {
                                                                                         "metadata":  {
                                                                                                          "dataType":  20,
                                                                                                          "category":  1,
                                                                                                          "nameResourceKey":  "resourcePath",
                                                                                                          "descriptionResourceKey":  "resourcePathDescription",
                                                                                                          "emptyValueResourceKey":  "airPrintResourcePathHint",
                                                                                                          "childSettings":  [
                                                                                                                            ],
                                                                                                          "options":  [
                                                                                                                      ],
                                                                                                          "entityKey":  "resourcePath",
                                                                                                          "booleanActions":  0,
                                                                                                          "policyType":  42,
                                                                                                          "enabled":  true
                                                                                                      }
                                                                                     },
                                                                                     {
                                                                                         "metadata":  {
                                                                                                          "dataType":  14,
                                                                                                          "category":  1,
                                                                                                          "nameResourceKey":  "airPrintPort",
                                                                                                          "descriptionResourceKey":  "iOSAirPrintPortDescription",
                                                                                                          "emptyValueResourceKey":  "default",
                                                                                                          "childSettings":  [
                                                                                                                            ],
                                                                                                          "options":  [
                                                                                                                      ],
                                                                                                          "entityKey":  "port",
                                                                                                          "booleanActions":  0,
                                                                                                          "policyType":  42,
                                                                                                          "enabled":  true
                                                                                                      }
                                                                                     },
                                                                                     {
                                                                                         "metadata":  {
                                                                                                          "dataType":  16,
                                                                                                          "category":  1,
                                                                                                          "nameResourceKey":  "forceTls",
                                                                                                          "descriptionResourceKey":  "forceTlsDescription",
                                                                                                          "childSettings":  [
                                                                                                                            ],
                                                                                                          "options":  [
                                                                                                                          {
                                                                                                                              "nameResourceKey":  "enableOption",
                                                                                                                              "value":  "true",
                                                                                                                              "enabled":  true
                                                                                                                          },
                                                                                                                          {
                                                                                                                              "nameResourceKey":  "disableOption",
                                                                                                                              "value":  "false",
                                                                                                                              "enabled":  true
                                                                                                                          }
                                                                                                                      ],
                                                                                                          "entityKey":  "forceTls",
                                                                                                          "booleanActions":  0,
                                                                                                          "defaultValue":  "false",
                                                                                                          "policyType":  42,
                                                                                                          "enabled":  true
                                                                                                      }
                                                                                     }
                                                                                 ],
                                                                     "dataType":  21,
                                                                     "category":  1,
                                                                     "nameResourceKey":  "airPrintTableName",
                                                                     "childSettings":  [
                                                                                       ],
                                                                     "options":  [
                                                                                 ],
                                                                     "entityKey":  "airPrintDestinations",
                                                                     "booleanActions":  0,
                                                                     "policyType":  42,
                                                                     "enabled":  true
                                                                 }
                                                             ],
                                           "options":  [
                                                       ],
                                           "booleanActions":  0,
                                           "policyType":  42,
                                           "enabled":  true
                                       }
                                   ]
 }
--- a/Documentation/ObjectInfo/airprint_macdevicefeatures.json
+++ b/Documentation/ObjectInfo/airprint_macdevicefeatures.json
@@ -1,138 +0,0 @@
 {
    "airprint_macdevicefeatures":  [
                                       {
                                           "isSettingDescription":  false,
                                           "showAsSectionHeader":  false,
                                           "dataType":  8,
                                           "category":  1,
                                           "nameResourceKey":  "MacDeviceFeaturesAirPrintHeader",
                                           "childSettings":  [
                                                             ],
                                           "options":  [
                                                       ],
                                           "booleanActions":  0,
                                           "policyType":  58,
                                           "enabled":  true
                                       },
                                       {
                                           "isSettingDescription":  false,
                                           "showAsSectionHeader":  true,
                                           "dataType":  8,
                                           "category":  1,
                                           "nameResourceKey":  "allEnrollmentTypesHeaderNameMac",
                                           "descriptionResourceKey":  "allEnrollmentTypesHeaderDescriptionMac",
                                           "childSettings":  [
                                                                 {
                                                                     "columns":  [
                                                                                     {
                                                                                         "metadata":  {
                                                                                                          "dataType":  20,
                                                                                                          "category":  1,
                                                                                                          "nameResourceKey":  "ipAddress",
                                                                                                          "descriptionResourceKey":  "ipAddressDescription",
                                                                                                          "emptyValueResourceKey":  "airPrintIpAddressHint",
                                                                                                          "childSettings":  [
                                                                                                                            ],
                                                                                                          "options":  [
                                                                                                                      ],
                                                                                                          "entityKey":  "ipAddress",
                                                                                                          "booleanActions":  0,
                                                                                                          "policyType":  58,
                                                                                                          "enabled":  true
                                                                                                      }
                                                                                     },
                                                                                     {
                                                                                         "metadata":  {
                                                                                                          "dataType":  20,
                                                                                                          "category":  1,
                                                                                                          "nameResourceKey":  "resourcePath",
                                                                                                          "descriptionResourceKey":  "resourcePathDescription",
                                                                                                          "emptyValueResourceKey":  "airPrintResourcePathHint",
                                                                                                          "childSettings":  [
                                                                                                                            ],
                                                                                                          "options":  [
                                                                                                                      ],
                                                                                                          "entityKey":  "resourcePath",
                                                                                                          "booleanActions":  0,
                                                                                                          "policyType":  58,
                                                                                                          "enabled":  true
                                                                                                      }
                                                                                     },
                                                                                     {
                                                                                         "metadata":  {
                                                                                                          "dataType":  14,
                                                                                                          "category":  1,
                                                                                                          "nameResourceKey":  "airPrintPort",
                                                                                                          "descriptionResourceKey":  "airPrintPortDescription",
                                                                                                          "emptyValueResourceKey":  "default",
                                                                                                          "childSettings":  [
                                                                                                                            ],
                                                                                                          "options":  [
                                                                                                                      ],
                                                                                                          "entityKey":  "port",
                                                                                                          "booleanActions":  0,
                                                                                                          "policyType":  58,
                                                                                                          "enabled":  true
                                                                                                      }
                                                                                     },
                                                                                     {
                                                                                         "metadata":  {
                                                                                                          "dataType":  16,
                                                                                                          "category":  1,
                                                                                                          "nameResourceKey":  "forceTls",
                                                                                                          "descriptionResourceKey":  "forceTlsDescription",
                                                                                                          "childSettings":  [
                                                                                                                            ],
                                                                                                          "options":  [
                                                                                                                          {
                                                                                                                              "nameResourceKey":  "enableOption",
                                                                                                                              "value":  "true",
                                                                                                                              "enabled":  true
                                                                                                                          },
                                                                                                                          {
                                                                                                                              "nameResourceKey":  "disableOption",
                                                                                                                              "value":  "false",
                                                                                                                              "enabled":  true
                                                                                                                          }
                                                                                                                      ],
                                                                                                          "entityKey":  "forceTls",
                                                                                                          "booleanActions":  0,
                                                                                                          "defaultValue":  "false",
                                                                                                          "policyType":  58,
                                                                                                          "enabled":  true
                                                                                                      }
                                                                                     }
                                                                                 ],
                                                                     "dataType":  21,
                                                                     "category":  1,
                                                                     "nameResourceKey":  "airPrintTableName",
                                                                     "childSettings":  [
                                                                                       ],
                                                                     "options":  [
                                                                                 ],
                                                                     "entityKey":  "airPrintDestinations",
                                                                     "booleanActions":  0,
                                                                     "policyType":  58,
                                                                     "enabled":  true
                                                                 }
                                                             ],
                                           "options":  [
                                                       ],
                                           "booleanActions":  0,
                                           "policyType":  58,
                                           "enabled":  true
                                       }
                                   ]
 }
--- a/Documentation/ObjectInfo/androiddefenderatp_complianceandroid.json
+++ b/Documentation/ObjectInfo/androiddefenderatp_complianceandroid.json
@@ -1,59 +0,0 @@
 {
    "androiddefenderatp_complianceandroid":  {
                                                 "isSettingDescription":  false,
                                                 "showAsSectionHeader":  false,
                                                 "dataType":  8,
                                                 "category":  146,
                                                 "nameResourceKey":  "complianceAtpDeviceRiskHeader",
                                                 "childSettings":  [
                                                                       {
                                                                           "dataType":  16,
                                                                           "category":  146,
                                                                           "nameResourceKey":  "complianceDeviceRiskATPRequirementName",
                                                                           "descriptionResourceKey":  "complianceDeviceRiskATPRequirementDescription",
                                                                           "childSettings":  [
                                                                                             ],
                                                                           "options":  [
                                                                                           {
                                                                                               "nameResourceKey":  "notConfigured",
                                                                                               "value":  "unavailable",
                                                                                               "enabled":  true
                                                                                           },
                                                                                           {
                                                                                               "nameResourceKey":  "clear",
                                                                                               "value":  "secured",
                                                                                               "enabled":  true
                                                                                           },
                                                                                           {
                                                                                               "nameResourceKey":  "lowOption",
                                                                                               "value":  "low",
                                                                                               "enabled":  true
                                                                                           },
                                                                                           {
                                                                                               "nameResourceKey":  "mediumOption",
                                                                                               "value":  "medium",
                                                                                               "enabled":  true
                                                                                           },
                                                                                           {
                                                                                               "nameResourceKey":  "highOption",
                                                                                               "value":  "high",
                                                                                               "enabled":  true
                                                                                           }
                                                                                       ],
                                                                           "entityKey":  "advancedThreatProtectionRequiredSecurityLevel",
                                                                           "booleanActions":  0,
                                                                           "defaultValue":  "unavailable",
                                                                           "unconfiguredValue":  "unavailable",
                                                                           "policyType":  29,
                                                                           "enabled":  false
                                                                       }
                                                                   ],
                                                 "options":  [
                                                             ],
                                                 "booleanActions":  0,
                                                 "policyType":  29,
                                                 "enabled":  true
                                             }
 }
--- a/Documentation/ObjectInfo/androiddefenderatp_complianceandroiddeviceowner.json
+++ b/Documentation/ObjectInfo/androiddefenderatp_complianceandroiddeviceowner.json
@@ -1,59 +0,0 @@
 {
    "androiddefenderatp_complianceandroiddeviceowner":  {
                                                            "isSettingDescription":  false,
                                                            "showAsSectionHeader":  false,
                                                            "dataType":  8,
                                                            "category":  146,
                                                            "nameResourceKey":  "complianceAtpDeviceRiskHeader",
                                                            "childSettings":  [
                                                                                  {
                                                                                      "dataType":  16,
                                                                                      "category":  146,
                                                                                      "nameResourceKey":  "complianceDeviceRiskATPRequirementName",
                                                                                      "descriptionResourceKey":  "complianceDeviceRiskATPRequirementDescription",
                                                                                      "childSettings":  [
                                                                                                        ],
                                                                                      "options":  [
                                                                                                      {
                                                                                                          "nameResourceKey":  "notConfigured",
                                                                                                          "value":  "unavailable",
                                                                                                          "enabled":  true
                                                                                                      },
                                                                                                      {
                                                                                                          "nameResourceKey":  "clear",
                                                                                                          "value":  "secured",
                                                                                                          "enabled":  true
                                                                                                      },
                                                                                                      {
                                                                                                          "nameResourceKey":  "lowOption",
                                                                                                          "value":  "low",
                                                                                                          "enabled":  true
                                                                                                      },
                                                                                                      {
                                                                                                          "nameResourceKey":  "mediumOption",
                                                                                                          "value":  "medium",
                                                                                                          "enabled":  true
                                                                                                      },
                                                                                                      {
                                                                                                          "nameResourceKey":  "highOption",
                                                                                                          "value":  "high",
                                                                                                          "enabled":  true
                                                                                                      }
                                                                                                  ],
                                                                                      "entityKey":  "advancedThreatProtectionRequiredSecurityLevel",
                                                                                      "booleanActions":  0,
                                                                                      "defaultValue":  "unavailable",
                                                                                      "unconfiguredValue":  "unavailable",
                                                                                      "policyType":  31,
                                                                                      "enabled":  false
                                                                                  }
                                                                              ],
                                                            "options":  [
                                                                        ],
                                                            "booleanActions":  0,
                                                            "policyType":  31,
                                                            "enabled":  true
                                                        }
 }
--- a/Documentation/ObjectInfo/androiddefenderatp_complianceandroidforwork.json
+++ b/Documentation/ObjectInfo/androiddefenderatp_complianceandroidforwork.json
@@ -1,59 +0,0 @@
 {
    "androiddefenderatp_complianceandroidforwork":  {
                                                        "isSettingDescription":  false,
                                                        "showAsSectionHeader":  false,
                                                        "dataType":  8,
                                                        "category":  146,
                                                        "nameResourceKey":  "complianceAtpDeviceRiskHeader",
                                                        "childSettings":  [
                                                                              {
                                                                                  "dataType":  16,
                                                                                  "category":  146,
                                                                                  "nameResourceKey":  "complianceDeviceRiskATPRequirementName",
                                                                                  "descriptionResourceKey":  "complianceDeviceRiskATPRequirementDescription",
                                                                                  "childSettings":  [
                                                                                                    ],
                                                                                  "options":  [
                                                                                                  {
                                                                                                      "nameResourceKey":  "notConfigured",
                                                                                                      "value":  "unavailable",
                                                                                                      "enabled":  true
                                                                                                  },
                                                                                                  {
                                                                                                      "nameResourceKey":  "clear",
                                                                                                      "value":  "secured",
                                                                                                      "enabled":  true
                                                                                                  },
                                                                                                  {
                                                                                                      "nameResourceKey":  "lowOption",
                                                                                                      "value":  "low",
                                                                                                      "enabled":  true
                                                                                                  },
                                                                                                  {
                                                                                                      "nameResourceKey":  "mediumOption",
                                                                                                      "value":  "medium",
                                                                                                      "enabled":  true
                                                                                                  },
                                                                                                  {
                                                                                                      "nameResourceKey":  "highOption",
                                                                                                      "value":  "high",
                                                                                                      "enabled":  true
                                                                                                  }
                                                                                              ],
                                                                                  "entityKey":  "advancedThreatProtectionRequiredSecurityLevel",
                                                                                  "booleanActions":  0,
                                                                                  "defaultValue":  "unavailable",
                                                                                  "unconfiguredValue":  "unavailable",
                                                                                  "policyType":  30,
                                                                                  "enabled":  false
                                                                              }
                                                                          ],
                                                        "options":  [
                                                                    ],
                                                        "booleanActions":  0,
                                                        "policyType":  30,
                                                        "enabled":  true
                                                    }
 }
--- a/Documentation/ObjectInfo/androiddeviceownerapplications_androiddeviceownergeneral.json
+++ b/Documentation/ObjectInfo/androiddeviceownerapplications_androiddeviceownergeneral.json
@@ -1,406 +0,0 @@
 {
    "androiddeviceownerapplications_androiddeviceownergeneral":  [
                                                                     {
                                                                         "isSettingDescription":  false,
                                                                         "showAsSectionHeader":  false,
                                                                         "dataType":  8,
                                                                         "category":  2,
                                                                         "nameResourceKey":  "workProfileHeaderDescription",
                                                                         "descriptionResourceKey":  "",
                                                                         "childSettings":  [
                                                                                           ],
                                                                         "options":  [
                                                                                     ],
                                                                         "booleanActions":  0,
                                                                         "policyType":  2,
                                                                         "enabled":  true
                                                                     },
                                                                     {
                                                                         "isSettingDescription":  false,
                                                                         "showAsSectionHeader":  true,
                                                                         "dataType":  8,
                                                                         "category":  2,
                                                                         "nameResourceKey":  "allAndroidCorpEnrollmentTypesHeaderName",
                                                                         "descriptionResourceKey":  "allAndroidCorpEnrollmentTypesHeaderDescription",
                                                                         "childSettings":  [
                                                                                               {
                                                                                                   "dataType":  0,
                                                                                                   "category":  2,
                                                                                                   "nameResourceKey":  "installUnknownSourcesAllowedName",
                                                                                                   "descriptionResourceKey":  "installUnknownSourcesAllowedDescription",
                                                                                                   "childSettings":  [
                                                                                                                     ],
                                                                                                   "options":  [
                                                                                                               ],
                                                                                                   "entityKey":  "appsAllowInstallFromUnknownSources",
                                                                                                   "booleanActions":  0,
                                                                                                   "defaultValue":  false,
                                                                                                   "policyType":  2,
                                                                                                   "enabled":  true
                                                                                               },
                                                                                               {
                                                                                                   "dataType":  16,
                                                                                                   "category":  2,
                                                                                                   "nameResourceKey":  "appsAutoUpdatePolicyNameWorkProfile",
                                                                                                   "descriptionResourceKey":  "appsAutoUpdatePolicyDescription",
                                                                                                   "childSettings":  [
                                                                                                                     ],
                                                                                                   "options":  [
                                                                                                                   {
                                                                                                                       "nameResourceKey":  "appsAutoUpdateNotConfigured",
                                                                                                                       "value":  "notConfigured",
                                                                                                                       "enabled":  true
                                                                                                                   },
                                                                                                                   {
                                                                                                                       "nameResourceKey":  "appsAutoUpdateUserChoice",
                                                                                                                       "value":  "userChoice",
                                                                                                                       "enabled":  true
                                                                                                                   },
                                                                                                                   {
                                                                                                                       "nameResourceKey":  "appsAutoUpdateNever",
                                                                                                                       "value":  "never",
                                                                                                                       "enabled":  true
                                                                                                                   },
                                                                                                                   {
                                                                                                                       "nameResourceKey":  "appsAutoUpdateWifiOnly",
                                                                                                                       "value":  "wiFiOnly",
                                                                                                                       "enabled":  true
                                                                                                                   },
                                                                                                                   {
                                                                                                                       "nameResourceKey":  "appsAutoUpdateAlways",
                                                                                                                       "value":  "always",
                                                                                                                       "enabled":  true
                                                                                                                   }
                                                                                                               ],
                                                                                                   "entityKey":  "appsAutoUpdatePolicy",
                                                                                                   "booleanActions":  0,
                                                                                                   "defaultValue":  "notConfigured",
                                                                                                   "unconfiguredValue":  "notConfigured",
                                                                                                   "policyType":  2,
                                                                                                   "enabled":  true
                                                                                               },
                                                                                               {
                                                                                                   "dataType":  16,
                                                                                                   "category":  2,
                                                                                                   "nameResourceKey":  "publicPlayStoreEnabledName",
                                                                                                   "descriptionResourceKey":  "publicPlayStoreEnabledDescription",
                                                                                                   "childSettings":  [
                                                                                                                     ],
                                                                                                   "options":  [
                                                                                                                   {
                                                                                                                       "nameResourceKey":  "publicPlayStoreSelectionNotConfigured",
                                                                                                                       "value":  "notConfigured",
                                                                                                                       "enabled":  true
                                                                                                                   },
                                                                                                                   {
                                                                                                                       "nameResourceKey":  "publicPlayStoreSelectionAllowList",
                                                                                                                       "value":  "allowList",
                                                                                                                       "enabled":  true
                                                                                                                   },
                                                                                                                   {
                                                                                                                       "nameResourceKey":  "publicPlayStoreSelectionBlockList",
                                                                                                                       "value":  "blockList",
                                                                                                                       "enabled":  true
                                                                                                                   }
                                                                                                               ],
                                                                                                   "entityKey":  "playStoreMode",
                                                                                                   "booleanActions":  0,
                                                                                                   "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":  [
                                                                                     ],
                                                                         "booleanActions":  0,
                                                                         "policyType":  2,
                                                                         "enabled":  true
                                                                     },
                                                                     {
                                                                         "isSettingDescription":  false,
                                                                         "showAsSectionHeader":  true,
                                                                         "dataType":  8,
                                                                         "category":  2,
                                                                         "nameResourceKey":  "dedicatedAndroidEnrollmentTypesHeaderName",
                                                                         "descriptionResourceKey":  "dedicatedAndroidEnrollmentTypesHeaderDescription",
                                                                         "childSettings":  [
                                                                                               {
                                                                                                   "columns":  [
                                                                                                                   {
                                                                                                                       "metadata":  {
                                                                                                                                        "dataType":  20,
                                                                                                                                        "category":  2,
                                                                                                                                        "nameResourceKey":  "appNameName",
                                                                                                                                        "descriptionResourceKey":  "Empty",
                                                                                                                                        "childSettings":  [
                                                                                                                                                          ],
                                                                                                                                        "options":  [
                                                                                                                                                    ],
                                                                                                                                        "entityKey":  "name",
                                                                                                                                        "booleanActions":  0,
                                                                                                                                        "policyType":  2,
                                                                                                                                        "enabled":  false
                                                                                                                                    }
                                                                                                                   },
                                                                                                                   {
                                                                                                                       "metadata":  {
                                                                                                                                        "dataType":  20,
                                                                                                                                        "category":  2,
                                                                                                                                        "nameResourceKey":  "packageName",
                                                                                                                                        "descriptionResourceKey":  "Empty",
                                                                                                                                        "childSettings":  [
                                                                                                                                                          ],
                                                                                                                                        "options":  [
                                                                                                                                                    ],
                                                                                                                                        "entityKey":  "appId",
                                                                                                                                        "booleanActions":  0,
                                                                                                                                        "policyType":  2,
                                                                                                                                        "enabled":  false
                                                                                                                                    }
                                                                                                                   },
                                                                                                                   {
                                                                                                                       "metadata":  {
                                                                                                                                        "dataType":  20,
                                                                                                                                        "category":  2,
                                                                                                                                        "nameResourceKey":  "appUrlName",
                                                                                                                                        "descriptionResourceKey":  "Empty",
                                                                                                                                        "childSettings":  [
                                                                                                                                                          ],
                                                                                                                                        "options":  [
                                                                                                                                                    ],
                                                                                                                                        "entityKey":  "appStoreUrl",
                                                                                                                                        "booleanActions":  0,
                                                                                                                                        "policyType":  2,
                                                                                                                                        "enabled":  false
                                                                                                                                    }
                                                                                                                   },
                                                                                                                   {
                                                                                                                       "metadata":  {
                                                                                                                                        "dataType":  20,
                                                                                                                                        "category":  2,
                                                                                                                                        "nameResourceKey":  "appPublisherName",
                                                                                                                                        "descriptionResourceKey":  "Empty",
                                                                                                                                        "childSettings":  [
                                                                                                                                                          ],
                                                                                                                                        "options":  [
                                                                                                                                                    ],
                                                                                                                                        "entityKey":  "publisher",
                                                                                                                                        "booleanActions":  0,
                                                                                                                                        "policyType":  2,
                                                                                                                                        "enabled":  false
                                                                                                                                    }
                                                                                                                   }
                                                                                                               ],
                                                                                                   "dataType":  21,
                                                                                                   "category":  2,
                                                                                                   "nameResourceKey":  "aadSharedDeviceDataClearAppsName",
                                                                                                   "descriptionResourceKey":  "aadSharedDeviceDataClearAppsDescription",
                                                                                                   "childSettings":  [
                                                                                                                     ],
                                                                                                   "options":  [
                                                                                                               ],
                                                                                                   "entityKey":  "azureAdSharedDeviceDataClearApps",
                                                                                                   "booleanActions":  0,
                                                                                                   "policyType":  2,
                                                                                                   "enabled":  false
                                                                                               }
                                                                                           ],
                                                                         "options":  [
                                                                                     ],
                                                                         "booleanActions":  0,
                                                                         "policyType":  2,
                                                                         "enabled":  false
                                                                     }
                                                                 ]
 }
--- a/Documentation/ObjectInfo/androiddeviceownerpolicymessages_androiddeviceownergeneral.json
+++ b/Documentation/ObjectInfo/androiddeviceownerpolicymessages_androiddeviceownergeneral.json
@@ -1,102 +0,0 @@
 {
    "androiddeviceownerpolicymessages_androiddeviceownergeneral":  {
                                                                       "isSettingDescription":  false,
                                                                       "showAsSectionHeader":  true,
                                                                       "dataType":  8,
                                                                       "category":  3,
                                                                       "nameResourceKey":  "allAndroidCorpEnrollmentTypesHeaderName",
                                                                       "descriptionResourceKey":  "allAndroidCorpEnrollmentTypesHeaderDescription",
                                                                       "childSettings":  [
                                                                                             {
                                                                                                 "isSettingDescription":  false,
                                                                                                 "showAsSectionHeader":  true,
                                                                                                 "dataType":  8,
                                                                                                 "category":  3,
                                                                                                 "nameResourceKey":  "shortSupportMessageName",
                                                                                                 "childSettings":  [
                                                                                                                       {
                                                                                                                           "dataType":  25,
                                                                                                                           "category":  3,
                                                                                                                           "childSettings":  [
                                                                                                                                             ],
                                                                                                                           "options":  [
                                                                                                                                       ],
                                                                                                                           "booleanActions":  0,
                                                                                                                           "policyType":  2,
                                                                                                                           "enabled":  true
                                                                                                                       }
                                                                                                                   ],
                                                                                                 "options":  [
                                                                                                             ],
                                                                                                 "booleanActions":  0,
                                                                                                 "policyType":  2,
                                                                                                 "enabled":  true
                                                                                             },
                                                                                             {
                                                                                                 "isSettingDescription":  false,
                                                                                                 "showAsSectionHeader":  true,
                                                                                                 "dataType":  8,
                                                                                                 "category":  3,
                                                                                                 "nameResourceKey":  "longSupportMessageName",
                                                                                                 "childSettings":  [
                                                                                                                       {
                                                                                                                           "dataType":  25,
                                                                                                                           "category":  3,
                                                                                                                           "childSettings":  [
                                                                                                                                             ],
                                                                                                                           "options":  [
                                                                                                                                       ],
                                                                                                                           "booleanActions":  0,
                                                                                                                           "policyType":  2,
                                                                                                                           "enabled":  true
                                                                                                                       }
                                                                                                                   ],
                                                                                                 "options":  [
                                                                                                             ],
                                                                                                 "booleanActions":  0,
                                                                                                 "policyType":  2,
                                                                                                 "enabled":  true
                                                                                             },
                                                                                             {
                                                                                                 "isSettingDescription":  false,
                                                                                                 "showAsSectionHeader":  true,
                                                                                                 "dataType":  8,
                                                                                                 "category":  3,
                                                                                                 "nameResourceKey":  "lockScreenMessageName",
                                                                                                 "childSettings":  [
                                                                                                                       {
                                                                                                                           "dataType":  25,
                                                                                                                           "category":  3,
                                                                                                                           "childSettings":  [
                                                                                                                                             ],
                                                                                                                           "options":  [
                                                                                                                                       ],
                                                                                                                           "booleanActions":  0,
                                                                                                                           "policyType":  2,
                                                                                                                           "enabled":  true
                                                                                                                       }
                                                                                                                   ],
                                                                                                 "options":  [
                                                                                                             ],
                                                                                                 "booleanActions":  0,
                                                                                                 "policyType":  2,
                                                                                                 "enabled":  true
                                                                                             }
                                                                                         ],
                                                                       "options":  [
                                                                                   ],
                                                                       "booleanActions":  0,
                                                                       "policyType":  2,
                                                                       "enabled":  true
                                                                   }
 }
--- a/Documentation/ObjectInfo/applicationguard_windows10endpointprotection.json
+++ b/Documentation/ObjectInfo/applicationguard_windows10endpointprotection.json
@@ -1,665 +0,0 @@
 {
    "applicationguard_windows10endpointprotection":  [
                                                         {
                                                             "dataType":  10,
                                                             "category":  4,
                                                             "nameResourceKey":  "applicationGuardInstallationText",
                                                             "childSettings":  [
                                                                               ],
                                                             "options":  [
                                                                         ],
                                                             "booleanActions":  0,
                                                             "policyType":  77,
                                                             "enabled":  true
                                                         },
                                                         {
                                                             "dataType":  0,
                                                             "category":  4,
                                                             "nameResourceKey":  "applicationGuardEnabledName",
                                                             "descriptionResourceKey":  "applicationGuardEnabledDescription",
                                                             "childSettings":  [
                                                                                   {
                                                                                       "dataType":  16,
                                                                                       "category":  4,
                                                                                       "nameResourceKey":  "applicationGuardClipboardBehaviorName",
                                                                                       "descriptionResourceKey":  "applicationGuardClipboardBehaviorDescription",
                                                                                       "childSettings":  [
                                                                                                         ],
                                                                                       "options":  [
                                                                                                       {
                                                                                                           "nameResourceKey":  "notConfigured",
                                                                                                           "value":  "notConfigured",
                                                                                                           "enabled":  true
                                                                                                       },
                                                                                                       {
                                                                                                           "nameResourceKey":  "applicationGuardClipboardAllowPCToBrowserName",
                                                                                                           "value":  "blockContainerToHost",
                                                                                                           "children":  [
                                                                                                                            {
                                                                                                                                "dataType":  16,
                                                                                                                                "category":  4,
                                                                                                                                "nameResourceKey":  "applicationGuardClipboardContentName",
                                                                                                                                "descriptionResourceKey":  "applicationGuardClipboardContentDescription",
                                                                                                                                "childSettings":  [
                                                                                                                                                  ],
                                                                                                                                "options":  [
                                                                                                                                                {
                                                                                                                                                    "nameResourceKey":  "notConfigured",
                                                                                                                                                    "value":  "notConfigured",
                                                                                                                                                    "enabled":  true
                                                                                                                                                },
                                                                                                                                                {
                                                                                                                                                    "nameResourceKey":  "applicationGuardClipboardContentTextName",
                                                                                                                                                    "value":  "blockImageFile",
                                                                                                                                                    "enabled":  true
                                                                                                                                                },
                                                                                                                                                {
                                                                                                                                                    "nameResourceKey":  "applicationGuardClipboardContentImageName",
                                                                                                                                                    "value":  "blockTextFile",
                                                                                                                                                    "enabled":  true
                                                                                                                                                },
                                                                                                                                                {
                                                                                                                                                    "nameResourceKey":  "applicationGuardClipboardContentBothName",
                                                                                                                                                    "value":  "blockNone",
                                                                                                                                                    "enabled":  true
                                                                                                                                                }
                                                                                                                                            ],
                                                                                                                                "entityKey":  "applicationGuardBlockFileTransfer",
                                                                                                                                "booleanActions":  0,
                                                                                                                                "defaultValue":  "notConfigured",
                                                                                                                                "unconfiguredValue":  "notConfigured",
                                                                                                                                "policyType":  77,
                                                                                                                                "enabled":  true
                                                                                                                            }
                                                                                                                        ],
                                                                                                           "enabled":  true
                                                                                                       },
                                                                                                       {
                                                                                                           "nameResourceKey":  "applicationGuardClipboardAllowBrowserToPCName",
                                                                                                           "value":  "blockHostToContainer",
                                                                                                           "children":  [
                                                                                                                            {
                                                                                                                                "dataType":  16,
                                                                                                                                "category":  4,
                                                                                                                                "nameResourceKey":  "applicationGuardClipboardContentName",
                                                                                                                                "descriptionResourceKey":  "applicationGuardClipboardContentDescription",
                                                                                                                                "childSettings":  [
                                                                                                                                                  ],
                                                                                                                                "options":  [
                                                                                                                                                {
                                                                                                                                                    "nameResourceKey":  "notConfigured",
                                                                                                                                                    "value":  "notConfigured",
                                                                                                                                                    "enabled":  true
                                                                                                                                                },
                                                                                                                                                {
                                                                                                                                                    "nameResourceKey":  "applicationGuardClipboardContentTextName",
                                                                                                                                                    "value":  "blockImageFile",
                                                                                                                                                    "enabled":  true
                                                                                                                                                },
                                                                                                                                                {
                                                                                                                                                    "nameResourceKey":  "applicationGuardClipboardContentImageName",
                                                                                                                                                    "value":  "blockTextFile",
                                                                                                                                                    "enabled":  true
                                                                                                                                                },
                                                                                                                                                {
                                                                                                                                                    "nameResourceKey":  "applicationGuardClipboardContentBothName",
                                                                                                                                                    "value":  "blockNone",
                                                                                                                                                    "enabled":  true
                                                                                                                                                }
                                                                                                                                            ],
                                                                                                                                "entityKey":  "applicationGuardBlockFileTransfer",
                                                                                                                                "booleanActions":  0,
                                                                                                                                "defaultValue":  "notConfigured",
                                                                                                                                "unconfiguredValue":  "notConfigured",
                                                                                                                                "policyType":  77,
                                                                                                                                "enabled":  true
                                                                                                                            }
                                                                                                                        ],
                                                                                                           "enabled":  true
                                                                                                       },
                                                                                                       {
                                                                                                           "nameResourceKey":  "applicationGuardClipboardAllowBothWayName",
                                                                                                           "value":  "blockNone",
                                                                                                           "children":  [
                                                                                                                            {
                                                                                                                                "dataType":  16,
                                                                                                                                "category":  4,
                                                                                                                                "nameResourceKey":  "applicationGuardClipboardContentName",
                                                                                                                                "descriptionResourceKey":  "applicationGuardClipboardContentDescription",
                                                                                                                                "childSettings":  [
                                                                                                                                                  ],
                                                                                                                                "options":  [
                                                                                                                                                {
                                                                                                                                                    "nameResourceKey":  "notConfigured",
                                                                                                                                                    "value":  "notConfigured",
                                                                                                                                                    "enabled":  true
                                                                                                                                                },
                                                                                                                                                {
                                                                                                                                                    "nameResourceKey":  "applicationGuardClipboardContentTextName",
                                                                                                                                                    "value":  "blockImageFile",
                                                                                                                                                    "enabled":  true
                                                                                                                                                },
                                                                                                                                                {
                                                                                                                                                    "nameResourceKey":  "applicationGuardClipboardContentImageName",
                                                                                                                                                    "value":  "blockTextFile",
                                                                                                                                                    "enabled":  true
                                                                                                                                                },
                                                                                                                                                {
                                                                                                                                                    "nameResourceKey":  "applicationGuardClipboardContentBothName",
                                                                                                                                                    "value":  "blockNone",
                                                                                                                                                    "enabled":  true
                                                                                                                                                }
                                                                                                                                            ],
                                                                                                                                "entityKey":  "applicationGuardBlockFileTransfer",
                                                                                                                                "booleanActions":  0,
                                                                                                                                "defaultValue":  "notConfigured",
                                                                                                                                "unconfiguredValue":  "notConfigured",
                                                                                                                                "policyType":  77,
                                                                                                                                "enabled":  true
                                                                                                                            }
                                                                                                                        ],
                                                                                                           "enabled":  true
                                                                                                       },
                                                                                                       {
                                                                                                           "nameResourceKey":  "applicationGuardClipboardBlockBothWayName",
                                                                                                           "value":  "blockBoth",
                                                                                                           "enabled":  true
                                                                                                       }
                                                                                                   ],
                                                                                       "entityKey":  "applicationGuardBlockClipboardSharing",
                                                                                       "booleanActions":  0,
                                                                                       "defaultValue":  "notConfigured",
                                                                                       "unconfiguredValue":  "notConfigured",
                                                                                       "policyType":  77,
                                                                                       "enabled":  true
                                                                                   },
                                                                                   {
                                                                                       "dataType":  0,
                                                                                       "category":  4,
                                                                                       "nameResourceKey":  "applicationGuardBlockNonEnterpriseContentName",
                                                                                       "descriptionResourceKey":  "applicationGuardBlockNonEnterpriseContentDescription",
                                                                                       "childSettings":  [
                                                                                                         ],
                                                                                       "options":  [
                                                                                                   ],
                                                                                       "entityKey":  "applicationGuardBlockNonEnterpriseContent",
                                                                                       "booleanActions":  3,
                                                                                       "defaultValue":  false,
                                                                                       "unconfiguredValue":  false,
                                                                                       "policyType":  77,
                                                                                       "enabled":  true
                                                                                   },
                                                                                   {
                                                                                       "dataType":  0,
                                                                                       "category":  4,
                                                                                       "nameResourceKey":  "applicationGuardPrintFromVirtualBrowserName",
                                                                                       "descriptionResourceKey":  "applicationGuardPrintFromVirtualBrowserDescription",
                                                                                       "childSettings":  [
                                                                                                             {
                                                                                                                 "dataType":  13,
                                                                                                                 "category":  4,
                                                                                                                 "nameResourceKey":  "applicationGuardAllowPrintToName",
                                                                                                                 "descriptionResourceKey":  "applicationGuardAllowPrintToDescription",
                                                                                                                 "emptyValueResourceKey":  "notConfigured",
                                                                                                                 "childSettings":  [
                                                                                                                                   ],
                                                                                                                 "options":  [
                                                                                                                                 {
                                                                                                                                     "nameResourceKey":  "applicationGuardPrintToPDFName",
                                                                                                                                     "value":  "applicationGuardAllowPrintToPDF",
                                                                                                                                     "enabled":  true
                                                                                                                                 },
                                                                                                                                 {
                                                                                                                                     "nameResourceKey":  "applicationGuardPrintToXPSName",
                                                                                                                                     "value":  "applicationGuardAllowPrintToXPS",
                                                                                                                                     "enabled":  true
                                                                                                                                 },
                                                                                                                                 {
                                                                                                                                     "nameResourceKey":  "applicationGuardPrintToLocalPrintersName",
                                                                                                                                     "value":  "applicationGuardAllowPrintToLocalPrinters",
                                                                                                                                     "enabled":  true
                                                                                                                                 },
                                                                                                                                 {
                                                                                                                                     "nameResourceKey":  "applicationGuardPrintToNetworkPrintersName",
                                                                                                                                     "value":  "applicationGuardAllowPrintToNetworkPrinters",
                                                                                                                                     "enabled":  true
                                                                                                                                 }
                                                                                                                             ],
                                                                                                                 "entityKey":  "applicationGuardPrintSettings",
                                                                                                                 "booleanActions":  0,
                                                                                                                 "policyType":  77,
                                                                                                                 "enabled":  true
                                                                                                             }
                                                                                                         ],
                                                                                       "options":  [
                                                                                                   ],
                                                                                       "entityKey":  "applicationGuardAllowPrinting",
                                                                                       "booleanActions":  0,
                                                                                       "defaultValue":  false,
                                                                                       "unconfiguredValue":  false,
                                                                                       "policyType":  77,
                                                                                       "enabled":  true
                                                                                   },
                                                                                   {
                                                                                       "dataType":  0,
                                                                                       "category":  4,
                                                                                       "nameResourceKey":  "applicationGuardAuditingName",
                                                                                       "descriptionResourceKey":  "applicationGuardAuditingDescription",
                                                                                       "childSettings":  [
                                                                                                         ],
                                                                                       "options":  [
                                                                                                   ],
                                                                                       "entityKey":  "applicationGuardForceAuditing",
                                                                                       "booleanActions":  0,
                                                                                       "defaultValue":  false,
                                                                                       "unconfiguredValue":  false,
                                                                                       "policyType":  77,
                                                                                       "enabled":  true
                                                                                   },
                                                                                   {
                                                                                       "dataType":  0,
                                                                                       "category":  4,
                                                                                       "nameResourceKey":  "applicationGuardAllowPersistenceName",
                                                                                       "descriptionResourceKey":  "applicationGuardAllowPersistenceDescription",
                                                                                       "childSettings":  [
                                                                                                         ],
                                                                                       "options":  [
                                                                                                   ],
                                                                                       "entityKey":  "applicationGuardAllowPersistence",
                                                                                       "booleanActions":  0,
                                                                                       "defaultValue":  false,
                                                                                       "unconfiguredValue":  false,
                                                                                       "policyType":  77,
                                                                                       "enabled":  true
                                                                                   },
                                                                                   {
                                                                                       "dataType":  0,
                                                                                       "category":  4,
                                                                                       "nameResourceKey":  "applicationGuardAllowVirtualGPUName",
                                                                                       "descriptionResourceKey":  "applicationGuardAllowVirtualGPUDescription",
                                                                                       "childSettings":  [
                                                                                                         ],
                                                                                       "options":  [
                                                                                                   ],
                                                                                       "entityKey":  "applicationGuardAllowVirtualGPU",
                                                                                       "booleanActions":  2,
                                                                                       "defaultValue":  false,
                                                                                       "unconfiguredValue":  false,
                                                                                       "policyType":  77,
                                                                                       "enabled":  true
                                                                                   },
                                                                                   {
                                                                                       "dataType":  0,
                                                                                       "category":  4,
                                                                                       "nameResourceKey":  "applicationGuardAllowFileSaveOnHostName",
                                                                                       "descriptionResourceKey":  "applicationGuardAllowFileSaveOnHostDescription",
                                                                                       "childSettings":  [
                                                                                                         ],
                                                                                       "options":  [
                                                                                                   ],
                                                                                       "entityKey":  "applicationGuardAllowFileSaveOnHost",
                                                                                       "booleanActions":  2,
                                                                                       "defaultValue":  false,
                                                                                       "unconfiguredValue":  false,
                                                                                       "policyType":  77,
                                                                                       "enabled":  true
                                                                                   }
                                                                               ],
                                                             "options":  [
                                                                         ],
                                                             "entityKey":  "applicationGuardEnabled",
                                                             "booleanActions":  2,
                                                             "defaultValue":  false,
                                                             "unconfiguredValue":  false,
                                                             "policyType":  77,
                                                             "enabled":  false
                                                         },
                                                         {
                                                             "dataType":  16,
                                                             "category":  4,
                                                             "nameResourceKey":  "applicationGuardEnabledName",
                                                             "descriptionResourceKey":  "applicationGuardEnabledOptionsDescription",
                                                             "childSettings":  [
                                                                                   {
                                                                                       "dataType":  16,
                                                                                       "category":  4,
                                                                                       "nameResourceKey":  "applicationGuardClipboardBehaviorName",
                                                                                       "descriptionResourceKey":  "applicationGuardClipboardBehaviorDescription",
                                                                                       "childSettings":  [
                                                                                                         ],
                                                                                       "options":  [
                                                                                                       {
                                                                                                           "nameResourceKey":  "notConfigured",
                                                                                                           "value":  "notConfigured",
                                                                                                           "enabled":  true
                                                                                                       },
                                                                                                       {
                                                                                                           "nameResourceKey":  "applicationGuardClipboardAllowPCToBrowserName",
                                                                                                           "value":  "blockContainerToHost",
                                                                                                           "children":  [
                                                                                                                            {
                                                                                                                                "dataType":  16,
                                                                                                                                "category":  4,
                                                                                                                                "nameResourceKey":  "applicationGuardClipboardContentName",
                                                                                                                                "descriptionResourceKey":  "applicationGuardClipboardContentDescription",
                                                                                                                                "childSettings":  [
                                                                                                                                                  ],
                                                                                                                                "options":  [
                                                                                                                                                {
                                                                                                                                                    "nameResourceKey":  "notConfigured",
                                                                                                                                                    "value":  "notConfigured",
                                                                                                                                                    "enabled":  true
                                                                                                                                                },
                                                                                                                                                {
                                                                                                                                                    "nameResourceKey":  "applicationGuardClipboardContentTextName",
                                                                                                                                                    "value":  "blockImageFile",
                                                                                                                                                    "enabled":  true
                                                                                                                                                },
                                                                                                                                                {
                                                                                                                                                    "nameResourceKey":  "applicationGuardClipboardContentImageName",
                                                                                                                                                    "value":  "blockTextFile",
                                                                                                                                                    "enabled":  true
                                                                                                                                                },
                                                                                                                                                {
                                                                                                                                                    "nameResourceKey":  "applicationGuardClipboardContentBothName",
                                                                                                                                                    "value":  "blockNone",
                                                                                                                                                    "enabled":  true
                                                                                                                                                }
                                                                                                                                            ],
                                                                                                                                "entityKey":  "applicationGuardBlockFileTransfer",
                                                                                                                                "booleanActions":  0,
                                                                                                                                "defaultValue":  "notConfigured",
                                                                                                                                "unconfiguredValue":  "notConfigured",
                                                                                                                                "policyType":  77,
                                                                                                                                "enabled":  true
                                                                                                                            }
                                                                                                                        ],
                                                                                                           "enabled":  true
                                                                                                       },
                                                                                                       {
                                                                                                           "nameResourceKey":  "applicationGuardClipboardAllowBrowserToPCName",
                                                                                                           "value":  "blockHostToContainer",
                                                                                                           "children":  [
                                                                                                                            {
                                                                                                                                "dataType":  16,
                                                                                                                                "category":  4,
                                                                                                                                "nameResourceKey":  "applicationGuardClipboardContentName",
                                                                                                                                "descriptionResourceKey":  "applicationGuardClipboardContentDescription",
                                                                                                                                "childSettings":  [
                                                                                                                                                  ],
                                                                                                                                "options":  [
                                                                                                                                                {
                                                                                                                                                    "nameResourceKey":  "notConfigured",
                                                                                                                                                    "value":  "notConfigured",
                                                                                                                                                    "enabled":  true
                                                                                                                                                },
                                                                                                                                                {
                                                                                                                                                    "nameResourceKey":  "applicationGuardClipboardContentTextName",
                                                                                                                                                    "value":  "blockImageFile",
                                                                                                                                                    "enabled":  true
                                                                                                                                                },
                                                                                                                                                {
                                                                                                                                                    "nameResourceKey":  "applicationGuardClipboardContentImageName",
                                                                                                                                                    "value":  "blockTextFile",
                                                                                                                                                    "enabled":  true
                                                                                                                                                },
                                                                                                                                                {
                                                                                                                                                    "nameResourceKey":  "applicationGuardClipboardContentBothName",
                                                                                                                                                    "value":  "blockNone",
                                                                                                                                                    "enabled":  true
                                                                                                                                                }
                                                                                                                                            ],
                                                                                                                                "entityKey":  "applicationGuardBlockFileTransfer",
                                                                                                                                "booleanActions":  0,
                                                                                                                                "defaultValue":  "notConfigured",
                                                                                                                                "unconfiguredValue":  "notConfigured",
                                                                                                                                "policyType":  77,
                                                                                                                                "enabled":  true
                                                                                                                            }
                                                                                                                        ],
                                                                                                           "enabled":  true
                                                                                                       },
                                                                                                       {
                                                                                                           "nameResourceKey":  "applicationGuardClipboardAllowBothWayName",
                                                                                                           "value":  "blockNone",
                                                                                                           "children":  [
                                                                                                                            {
                                                                                                                                "dataType":  16,
                                                                                                                                "category":  4,
                                                                                                                                "nameResourceKey":  "applicationGuardClipboardContentName",
                                                                                                                                "descriptionResourceKey":  "applicationGuardClipboardContentDescription",
                                                                                                                                "childSettings":  [
                                                                                                                                                  ],
                                                                                                                                "options":  [
                                                                                                                                                {
                                                                                                                                                    "nameResourceKey":  "notConfigured",
                                                                                                                                                    "value":  "notConfigured",
                                                                                                                                                    "enabled":  true
                                                                                                                                                },
                                                                                                                                                {
                                                                                                                                                    "nameResourceKey":  "applicationGuardClipboardContentTextName",
                                                                                                                                                    "value":  "blockImageFile",
                                                                                                                                                    "enabled":  true
                                                                                                                                                },
                                                                                                                                                {
                                                                                                                                                    "nameResourceKey":  "applicationGuardClipboardContentImageName",
                                                                                                                                                    "value":  "blockTextFile",
                                                                                                                                                    "enabled":  true
                                                                                                                                                },
                                                                                                                                                {
                                                                                                                                                    "nameResourceKey":  "applicationGuardClipboardContentBothName",
                                                                                                                                                    "value":  "blockNone",
                                                                                                                                                    "enabled":  true
                                                                                                                                                }
                                                                                                                                            ],
                                                                                                                                "entityKey":  "applicationGuardBlockFileTransfer",
                                                                                                                                "booleanActions":  0,
                                                                                                                                "defaultValue":  "notConfigured",
                                                                                                                                "unconfiguredValue":  "notConfigured",
                                                                                                                                "policyType":  77,
                                                                                                                                "enabled":  true
                                                                                                                            }
                                                                                                                        ],
                                                                                                           "enabled":  true
                                                                                                       },
                                                                                                       {
                                                                                                           "nameResourceKey":  "applicationGuardClipboardBlockBothWayName",
                                                                                                           "value":  "blockBoth",
                                                                                                           "enabled":  true
                                                                                                       }
                                                                                                   ],
                                                                                       "entityKey":  "applicationGuardBlockClipboardSharing",
                                                                                       "booleanActions":  0,
                                                                                       "defaultValue":  "notConfigured",
                                                                                       "unconfiguredValue":  "notConfigured",
                                                                                       "policyType":  77,
                                                                                       "enabled":  true
                                                                                   },
                                                                                   {
                                                                                       "dataType":  0,
                                                                                       "category":  4,
                                                                                       "nameResourceKey":  "applicationGuardBlockNonEnterpriseContentName",
                                                                                       "descriptionResourceKey":  "applicationGuardBlockNonEnterpriseContentDescription",
                                                                                       "childSettings":  [
                                                                                                         ],
                                                                                       "options":  [
                                                                                                   ],
                                                                                       "entityKey":  "applicationGuardBlockNonEnterpriseContent",
                                                                                       "booleanActions":  3,
                                                                                       "defaultValue":  false,
                                                                                       "unconfiguredValue":  false,
                                                                                       "policyType":  77,
                                                                                       "enabled":  true
                                                                                   },
                                                                                   {
                                                                                       "dataType":  0,
                                                                                       "category":  4,
                                                                                       "nameResourceKey":  "applicationGuardPrintFromVirtualBrowserName",
                                                                                       "descriptionResourceKey":  "applicationGuardPrintFromVirtualBrowserDescription",
                                                                                       "childSettings":  [
                                                                                                             {
                                                                                                                 "dataType":  13,
                                                                                                                 "category":  4,
                                                                                                                 "nameResourceKey":  "applicationGuardAllowPrintToName",
                                                                                                                 "descriptionResourceKey":  "applicationGuardAllowPrintToDescription",
                                                                                                                 "emptyValueResourceKey":  "notConfigured",
                                                                                                                 "childSettings":  [
                                                                                                                                   ],
                                                                                                                 "options":  [
                                                                                                                                 {
                                                                                                                                     "nameResourceKey":  "applicationGuardPrintToPDFName",
                                                                                                                                     "value":  "applicationGuardAllowPrintToPDF",
                                                                                                                                     "enabled":  true
                                                                                                                                 },
                                                                                                                                 {
                                                                                                                                     "nameResourceKey":  "applicationGuardPrintToXPSName",
                                                                                                                                     "value":  "applicationGuardAllowPrintToXPS",
                                                                                                                                     "enabled":  true
                                                                                                                                 },
                                                                                                                                 {
                                                                                                                                     "nameResourceKey":  "applicationGuardPrintToLocalPrintersName",
                                                                                                                                     "value":  "applicationGuardAllowPrintToLocalPrinters",
                                                                                                                                     "enabled":  true
                                                                                                                                 },
                                                                                                                                 {
                                                                                                                                     "nameResourceKey":  "applicationGuardPrintToNetworkPrintersName",
                                                                                                                                     "value":  "applicationGuardAllowPrintToNetworkPrinters",
                                                                                                                                     "enabled":  true
                                                                                                                                 }
                                                                                                                             ],
                                                                                                                 "entityKey":  "applicationGuardPrintSettings",
                                                                                                                 "booleanActions":  0,
                                                                                                                 "policyType":  77,
                                                                                                                 "enabled":  true
                                                                                                             }
                                                                                                         ],
                                                                                       "options":  [
                                                                                                   ],
                                                                                       "entityKey":  "applicationGuardAllowPrinting",
                                                                                       "booleanActions":  0,
                                                                                       "defaultValue":  false,
                                                                                       "unconfiguredValue":  false,
                                                                                       "policyType":  77,
                                                                                       "enabled":  true
                                                                                   },
                                                                                   {
                                                                                       "dataType":  0,
                                                                                       "category":  4,
                                                                                       "nameResourceKey":  "applicationGuardAuditingName",
                                                                                       "descriptionResourceKey":  "applicationGuardAuditingDescription",
                                                                                       "childSettings":  [
                                                                                                         ],
                                                                                       "options":  [
                                                                                                   ],
                                                                                       "entityKey":  "applicationGuardForceAuditing",
                                                                                       "booleanActions":  0,
                                                                                       "defaultValue":  false,
                                                                                       "unconfiguredValue":  false,
                                                                                       "policyType":  77,
                                                                                       "enabled":  true
                                                                                   },
                                                                                   {
                                                                                       "dataType":  0,
                                                                                       "category":  4,
                                                                                       "nameResourceKey":  "applicationGuardAllowPersistenceName",
                                                                                       "descriptionResourceKey":  "applicationGuardAllowPersistenceDescription",
                                                                                       "childSettings":  [
                                                                                                         ],
                                                                                       "options":  [
                                                                                                   ],
                                                                                       "entityKey":  "applicationGuardAllowPersistence",
                                                                                       "booleanActions":  0,
                                                                                       "defaultValue":  false,
                                                                                       "unconfiguredValue":  false,
                                                                                       "policyType":  77,
                                                                                       "enabled":  true
                                                                                   },
                                                                                   {
                                                                                       "dataType":  0,
                                                                                       "category":  4,
                                                                                       "nameResourceKey":  "applicationGuardAllowVirtualGPUName",
                                                                                       "descriptionResourceKey":  "applicationGuardAllowVirtualGPUDescription",
                                                                                       "childSettings":  [
                                                                                                         ],
                                                                                       "options":  [
                                                                                                   ],
                                                                                       "entityKey":  "applicationGuardAllowVirtualGPU",
                                                                                       "booleanActions":  2,
                                                                                       "defaultValue":  false,
                                                                                       "unconfiguredValue":  false,
                                                                                       "policyType":  77,
                                                                                       "enabled":  true
                                                                                   },
                                                                                   {
                                                                                       "dataType":  0,
                                                                                       "category":  4,
                                                                                       "nameResourceKey":  "applicationGuardAllowFileSaveOnHostName",
                                                                                       "descriptionResourceKey":  "applicationGuardAllowFileSaveOnHostDescription",
                                                                                       "childSettings":  [
                                                                                                         ],
                                                                                       "options":  [
                                                                                                   ],
                                                                                       "entityKey":  "applicationGuardAllowFileSaveOnHost",
                                                                                       "booleanActions":  2,
                                                                                       "defaultValue":  false,
                                                                                       "unconfiguredValue":  false,
                                                                                       "policyType":  77,
                                                                                       "enabled":  true
                                                                                   }
                                                                               ],
                                                             "options":  [
                                                                             {
                                                                                 "nameResourceKey":  "notConfigured",
                                                                                 "value":  "notConfigured",
                                                                                 "enabled":  true
                                                                             },
                                                                             {
                                                                                 "nameResourceKey":  "ApplicationGuardEnabledOptionsEnabledForEdge",
                                                                                 "value":  "enabledForEdge",
                                                                                 "enabled":  true
                                                                             }
                                                                         ],
                                                             "entityKey":  "applicationGuardEnabledOptions",
                                                             "booleanActions":  0,
                                                             "defaultValue":  "notConfigured",
                                                             "unconfiguredValue":  "notConfigured",
                                                             "policyType":  77,
                                                             "enabled":  true
                                                         }
                                                     ]
 }
--- a/Documentation/ObjectInfo/applicationrestrictions_androidgeneral.json
+++ b/Documentation/ObjectInfo/applicationrestrictions_androidgeneral.json
@@ -1,125 +0,0 @@
 {
    "applicationrestrictions_androidgeneral":  {
                                                   "dataType":  16,
                                                   "category":  5,
                                                   "nameResourceKey":  "restrictedAppsListOptionsName",
                                                   "descriptionResourceKey":  "restrictedAppsListOptionsDescription",
                                                   "childSettings":  [
                                                                         {
                                                                             "columns":  [
                                                                                             {
                                                                                                 "metadata":  {
                                                                                                                  "dataType":  20,
                                                                                                                  "category":  5,
                                                                                                                  "nameResourceKey":  "appUrlName",
                                                                                                                  "descriptionResourceKey":  "empty",
                                                                                                                  "emptyValueResourceKey":  "androidAppStoreExample",
                                                                                                                  "childSettings":  [
                                                                                                                                    ],
                                                                                                                  "options":  [
                                                                                                                              ],
                                                                                                                  "entityKey":  "appStoreUrl",
                                                                                                                  "booleanActions":  0,
                                                                                                                  "policyType":  20,
                                                                                                                  "enabled":  true
                                                                                                              }
                                                                                             },
                                                                                             {
                                                                                                 "metadata":  {
                                                                                                                  "dataType":  20,
                                                                                                                  "category":  5,
                                                                                                                  "nameResourceKey":  "appBundleIdColumn",
                                                                                                                  "descriptionResourceKey":  "empty",
                                                                                                                  "emptyValueResourceKey":  "bundleIdExample",
                                                                                                                  "childSettings":  [
                                                                                                                                    ],
                                                                                                                  "options":  [
                                                                                                                              ],
                                                                                                                  "entityKey":  "appId",
                                                                                                                  "booleanActions":  0,
                                                                                                                  "policyType":  20,
                                                                                                                  "enabled":  true
                                                                                                              }
                                                                                             },
                                                                                             {
                                                                                                 "metadata":  {
                                                                                                                  "dataType":  20,
                                                                                                                  "category":  5,
                                                                                                                  "nameResourceKey":  "appNameName",
                                                                                                                  "descriptionResourceKey":  "empty",
                                                                                                                  "childSettings":  [
                                                                                                                                    ],
                                                                                                                  "options":  [
                                                                                                                              ],
                                                                                                                  "entityKey":  "name",
                                                                                                                  "booleanActions":  0,
                                                                                                                  "policyType":  20,
                                                                                                                  "enabled":  true
                                                                                                              }
                                                                                             },
                                                                                             {
                                                                                                 "metadata":  {
                                                                                                                  "dataType":  20,
                                                                                                                  "category":  5,
                                                                                                                  "nameResourceKey":  "appPublisherName",
                                                                                                                  "descriptionResourceKey":  "empty",
                                                                                                                  "childSettings":  [
                                                                                                                                    ],
                                                                                                                  "options":  [
                                                                                                                              ],
                                                                                                                  "entityKey":  "publisher",
                                                                                                                  "booleanActions":  0,
                                                                                                                  "policyType":  20,
                                                                                                                  "enabled":  true
                                                                                                              }
                                                                                             }
                                                                                         ],
                                                                             "dataType":  21,
                                                                             "category":  5,
                                                                             "nameResourceKey":  "appListTableName",
                                                                             "descriptionResourceKey":  "googleAppUrlHelp",
                                                                             "childSettings":  [
                                                                                               ],
                                                                             "options":  [
                                                                                         ],
                                                                             "entityKey":  "compliantAppsList",
                                                                             "booleanActions":  0,
                                                                             "policyType":  20,
                                                                             "enabled":  true
                                                                         }
                                                                     ],
                                                   "options":  [
                                                                   {
                                                                       "nameResourceKey":  "notConfigured",
                                                                       "value":  "none",
                                                                       "enabled":  true
                                                                   },
                                                                   {
                                                                       "nameResourceKey":  "notInList",
                                                                       "value":  "appsNotInListCompliant",
                                                                       "enabled":  true
                                                                   },
                                                                   {
                                                                       "nameResourceKey":  "inList",
                                                                       "value":  "appsInListCompliant",
                                                                       "enabled":  true
                                                                   }
                                                               ],
                                                   "entityKey":  "compliantAppListType",
                                                   "booleanActions":  0,
                                                   "defaultValue":  "none",
                                                   "unconfiguredValue":  "none",
                                                   "policyType":  20,
                                                   "enabled":  true
                                               }
 }
--- a/Documentation/ObjectInfo/applicationrestrictions_iosgeneral.json
+++ b/Documentation/ObjectInfo/applicationrestrictions_iosgeneral.json
@@ -1,159 +0,0 @@
 {
    "applicationrestrictions_iosgeneral":  [
                                               {
                                                   "isSettingDescription":  false,
                                                   "showAsSectionHeader":  false,
                                                   "dataType":  8,
                                                   "category":  5,
                                                   "nameResourceKey":  "IosGeneralApplicationRestrictionsHeader",
                                                   "childSettings":  [
                                                                     ],
                                                   "options":  [
                                                               ],
                                                   "booleanActions":  0,
                                                   "policyType":  46,
                                                   "enabled":  true
                                               },
                                               {
                                                   "isSettingDescription":  false,
                                                   "showAsSectionHeader":  true,
                                                   "dataType":  8,
                                                   "category":  5,
                                                   "nameResourceKey":  "deviceEnrollmentAndAutomatedDeviceEnrollmentHeaderName",
                                                   "descriptionResourceKey":  "deviceEnrollmentAndAutomatedDeviceEnrollmentHeaderDescription",
                                                   "childSettings":  [
                                                                         {
                                                                             "dataType":  16,
                                                                             "category":  5,
                                                                             "nameResourceKey":  "restrictedAppsListOptionsName",
                                                                             "descriptionResourceKey":  "restrictedAppsListOptionsDescription",
                                                                             "childSettings":  [
                                                                                                   {
                                                                                                       "columns":  [
                                                                                                                       {
                                                                                                                           "metadata":  {
                                                                                                                                            "dataType":  20,
                                                                                                                                            "category":  5,
                                                                                                                                            "nameResourceKey":  "appUrlName",
                                                                                                                                            "descriptionResourceKey":  "empty",
                                                                                                                                            "emptyValueResourceKey":  "kioskModeAppStoreExample",
                                                                                                                                            "childSettings":  [
                                                                                                                                                              ],
                                                                                                                                            "options":  [
                                                                                                                                                        ],
                                                                                                                                            "entityKey":  "appStoreUrl",
                                                                                                                                            "booleanActions":  0,
                                                                                                                                            "policyType":  46,
                                                                                                                                            "enabled":  true
                                                                                                                                        }
                                                                                                                       },
                                                                                                                       {
                                                                                                                           "metadata":  {
                                                                                                                                            "dataType":  20,
                                                                                                                                            "category":  5,
                                                                                                                                            "nameResourceKey":  "appBundleIdColumn",
                                                                                                                                            "descriptionResourceKey":  "empty",
                                                                                                                                            "emptyValueResourceKey":  "bundleIdExample",
                                                                                                                                            "childSettings":  [
                                                                                                                                                              ],
                                                                                                                                            "options":  [
                                                                                                                                                        ],
                                                                                                                                            "entityKey":  "appId",
                                                                                                                                            "booleanActions":  0,
                                                                                                                                            "policyType":  46,
                                                                                                                                            "enabled":  true
                                                                                                                                        }
                                                                                                                       },
                                                                                                                       {
                                                                                                                           "metadata":  {
                                                                                                                                            "dataType":  20,
                                                                                                                                            "category":  5,
                                                                                                                                            "nameResourceKey":  "appNameName",
                                                                                                                                            "descriptionResourceKey":  "empty",
                                                                                                                                            "childSettings":  [
                                                                                                                                                              ],
                                                                                                                                            "options":  [
                                                                                                                                                        ],
                                                                                                                                            "entityKey":  "name",
                                                                                                                                            "booleanActions":  0,
                                                                                                                                            "policyType":  46,
                                                                                                                                            "enabled":  true
                                                                                                                                        }
                                                                                                                       },
                                                                                                                       {
                                                                                                                           "metadata":  {
                                                                                                                                            "dataType":  20,
                                                                                                                                            "category":  5,
                                                                                                                                            "nameResourceKey":  "appPublisherName",
                                                                                                                                            "descriptionResourceKey":  "empty",
                                                                                                                                            "childSettings":  [
                                                                                                                                                              ],
                                                                                                                                            "options":  [
                                                                                                                                                        ],
                                                                                                                                            "entityKey":  "publisher",
                                                                                                                                            "booleanActions":  0,
                                                                                                                                            "policyType":  46,
                                                                                                                                            "enabled":  true
                                                                                                                                        }
                                                                                                                       }
                                                                                                                   ],
                                                                                                       "dataType":  21,
                                                                                                       "category":  5,
                                                                                                       "nameResourceKey":  "appListTableName",
                                                                                                       "descriptionResourceKey":  "iosAppUrlHelp",
                                                                                                       "childSettings":  [
                                                                                                                         ],
                                                                                                       "options":  [
                                                                                                                   ],
                                                                                                       "entityKey":  "compliantAppsList",
                                                                                                       "booleanActions":  0,
                                                                                                       "policyType":  46,
                                                                                                       "enabled":  true
                                                                                                   }
                                                                                               ],
                                                                             "options":  [
                                                                                             {
                                                                                                 "nameResourceKey":  "notConfigured",
                                                                                                 "value":  "none",
                                                                                                 "enabled":  true
                                                                                             },
                                                                                             {
                                                                                                 "nameResourceKey":  "notInList",
                                                                                                 "value":  "appsNotInListCompliant",
                                                                                                 "enabled":  true
                                                                                             },
                                                                                             {
                                                                                                 "nameResourceKey":  "inList",
                                                                                                 "value":  "appsInListCompliant",
                                                                                                 "enabled":  true
                                                                                             }
                                                                                         ],
                                                                             "entityKey":  "compliantAppListType",
                                                                             "booleanActions":  0,
                                                                             "defaultValue":  "none",
                                                                             "unconfiguredValue":  "none",
                                                                             "policyType":  46,
                                                                             "enabled":  true
                                                                         }
                                                                     ],
                                                   "options":  [
                                                               ],
                                                   "booleanActions":  0,
                                                   "policyType":  46,
                                                   "enabled":  true
                                               }
                                           ]
 }
--- a/Documentation/ObjectInfo/applicationrestrictions_macgeneral.json
+++ b/Documentation/ObjectInfo/applicationrestrictions_macgeneral.json
@@ -1,122 +0,0 @@
 {
    "applicationrestrictions_macgeneral":  {
                                               "isSettingDescription":  false,
                                               "showAsSectionHeader":  true,
                                               "dataType":  8,
                                               "category":  5,
                                               "nameResourceKey":  "allEnrollmentTypesHeaderNameMac",
                                               "descriptionResourceKey":  "allEnrollmentTypesHeaderDescriptionMac",
                                               "childSettings":  [
                                                                     {
                                                                         "dataType":  16,
                                                                         "category":  5,
                                                                         "nameResourceKey":  "restrictedAppsListOptionsName",
                                                                         "descriptionResourceKey":  "restrictedAppsListOptionsDescription",
                                                                         "childSettings":  [
                                                                                               {
                                                                                                   "columns":  [
                                                                                                                   {
                                                                                                                       "metadata":  {
                                                                                                                                        "dataType":  20,
                                                                                                                                        "category":  5,
                                                                                                                                        "nameResourceKey":  "appBundleIdColumn",
                                                                                                                                        "descriptionResourceKey":  "empty",
                                                                                                                                        "emptyValueResourceKey":  "bundleIdExample",
                                                                                                                                        "childSettings":  [
                                                                                                                                                          ],
                                                                                                                                        "options":  [
                                                                                                                                                    ],
                                                                                                                                        "entityKey":  "appId",
                                                                                                                                        "booleanActions":  0,
                                                                                                                                        "policyType":  61,
                                                                                                                                        "enabled":  true
                                                                                                                                    }
                                                                                                                   },
                                                                                                                   {
                                                                                                                       "metadata":  {
                                                                                                                                        "dataType":  20,
                                                                                                                                        "category":  5,
                                                                                                                                        "nameResourceKey":  "appNameName",
                                                                                                                                        "descriptionResourceKey":  "empty",
                                                                                                                                        "childSettings":  [
                                                                                                                                                          ],
                                                                                                                                        "options":  [
                                                                                                                                                    ],
                                                                                                                                        "entityKey":  "name",
                                                                                                                                        "booleanActions":  0,
                                                                                                                                        "policyType":  61,
                                                                                                                                        "enabled":  true
                                                                                                                                    }
                                                                                                                   },
                                                                                                                   {
                                                                                                                       "metadata":  {
                                                                                                                                        "dataType":  20,
                                                                                                                                        "category":  5,
                                                                                                                                        "nameResourceKey":  "appPublisherName",
                                                                                                                                        "descriptionResourceKey":  "empty",
                                                                                                                                        "childSettings":  [
                                                                                                                                                          ],
                                                                                                                                        "options":  [
                                                                                                                                                    ],
                                                                                                                                        "entityKey":  "publisher",
                                                                                                                                        "booleanActions":  0,
                                                                                                                                        "policyType":  61,
                                                                                                                                        "enabled":  true
                                                                                                                                    }
                                                                                                                   }
                                                                                                               ],
                                                                                                   "dataType":  21,
                                                                                                   "category":  5,
                                                                                                   "nameResourceKey":  "appListTableName",
                                                                                                   "descriptionResourceKey":  "",
                                                                                                   "childSettings":  [
                                                                                                                     ],
                                                                                                   "options":  [
                                                                                                               ],
                                                                                                   "entityKey":  "compliantAppsList",
                                                                                                   "booleanActions":  0,
                                                                                                   "policyType":  61,
                                                                                                   "enabled":  true
                                                                                               }
                                                                                           ],
                                                                         "options":  [
                                                                                         {
                                                                                             "nameResourceKey":  "notConfigured",
                                                                                             "value":  "none",
                                                                                             "enabled":  true
                                                                                         },
                                                                                         {
                                                                                             "nameResourceKey":  "notInList",
                                                                                             "value":  "appsNotInListCompliant",
                                                                                             "enabled":  true
                                                                                         },
                                                                                         {
                                                                                             "nameResourceKey":  "inList",
                                                                                             "value":  "appsInListCompliant",
                                                                                             "enabled":  true
                                                                                         }
                                                                                     ],
                                                                         "entityKey":  "compliantAppListType",
                                                                         "booleanActions":  0,
                                                                         "defaultValue":  "none",
                                                                         "unconfiguredValue":  "none",
                                                                         "policyType":  61,
                                                                         "enabled":  true
                                                                     }
                                                                 ],
                                               "options":  [
                                                           ],
                                               "booleanActions":  0,
                                               "policyType":  61,
                                               "enabled":  true
                                           }
 }
--- a/Documentation/ObjectInfo/applicationrestrictions_windowsphonegeneral.json
+++ b/Documentation/ObjectInfo/applicationrestrictions_windowsphonegeneral.json
@@ -1,106 +0,0 @@
 {
    "applicationrestrictions_windowsphonegeneral":  {
                                                        "dataType":  16,
                                                        "category":  5,
                                                        "nameResourceKey":  "blockUsageofUserInstalledStoreApps",
                                                        "descriptionResourceKey":  "windowsAppNonComplianceTypeDescription",
                                                        "childSettings":  [
                                                                              {
                                                                                  "columns":  [
                                                                                                  {
                                                                                                      "metadata":  {
                                                                                                                       "dataType":  20,
                                                                                                                       "category":  5,
                                                                                                                       "nameResourceKey":  "appUrlName",
                                                                                                                       "descriptionResourceKey":  "windowsAppUrlHelp",
                                                                                                                       "emptyValueResourceKey":  "windowsAppUrlExample",
                                                                                                                       "childSettings":  [
                                                                                                                                         ],
                                                                                                                       "options":  [
                                                                                                                                   ],
                                                                                                                       "entityKey":  "appStoreUrl",
                                                                                                                       "booleanActions":  0,
                                                                                                                       "policyType":  101,
                                                                                                                       "enabled":  true
                                                                                                                   }
                                                                                                  },
                                                                                                  {
                                                                                                      "metadata":  {
                                                                                                                       "dataType":  20,
                                                                                                                       "category":  5,
                                                                                                                       "nameResourceKey":  "appNameName",
                                                                                                                       "descriptionResourceKey":  "forYourOwnReference",
                                                                                                                       "childSettings":  [
                                                                                                                                         ],
                                                                                                                       "options":  [
                                                                                                                                   ],
                                                                                                                       "entityKey":  "name",
                                                                                                                       "booleanActions":  0,
                                                                                                                       "policyType":  101,
                                                                                                                       "enabled":  true
                                                                                                                   }
                                                                                                  },
                                                                                                  {
                                                                                                      "metadata":  {
                                                                                                                       "dataType":  20,
                                                                                                                       "category":  5,
                                                                                                                       "nameResourceKey":  "appPublisherName",
                                                                                                                       "descriptionResourceKey":  "forYourOwnReference",
                                                                                                                       "childSettings":  [
                                                                                                                                         ],
                                                                                                                       "options":  [
                                                                                                                                   ],
                                                                                                                       "entityKey":  "publisher",
                                                                                                                       "booleanActions":  0,
                                                                                                                       "policyType":  101,
                                                                                                                       "enabled":  true
                                                                                                                   }
                                                                                                  }
                                                                                              ],
                                                                                  "dataType":  21,
                                                                                  "category":  5,
                                                                                  "nameResourceKey":  "appListTableName",
                                                                                  "descriptionResourceKey":  "windowsAppUrlHelp",
                                                                                  "childSettings":  [
                                                                                                    ],
                                                                                  "options":  [
                                                                                              ],
                                                                                  "entityKey":  "compliantAppsList",
                                                                                  "booleanActions":  0,
                                                                                  "policyType":  101,
                                                                                  "enabled":  true
                                                                              }
                                                                          ],
                                                        "options":  [
                                                                        {
                                                                            "nameResourceKey":  "notConfigured",
                                                                            "value":  "none",
                                                                            "enabled":  true
                                                                        },
                                                                        {
                                                                            "nameResourceKey":  "blockedList",
                                                                            "value":  "appsNotInListCompliant",
                                                                            "enabled":  true
                                                                        },
                                                                        {
                                                                            "nameResourceKey":  "allowedList",
                                                                            "value":  "appsInListCompliant",
                                                                            "enabled":  true
                                                                        }
                                                                    ],
                                                        "entityKey":  "compliantAppListType",
                                                        "booleanActions":  0,
                                                        "defaultValue":  "none",
                                                        "unconfiguredValue":  "none",
                                                        "policyType":  101,
                                                        "enabled":  true
                                                    }
 }
--- a/Documentation/ObjectInfo/applications_windows10general.json
+++ b/Documentation/ObjectInfo/applications_windows10general.json
@@ -1,334 +0,0 @@
 {
    "applications_windows10general":  [
                                          {
                                              "dataType":  0,
                                              "category":  7,
                                              "nameResourceKey":  "blockAppStoreWindowsMobileOnlyName",
                                              "descriptionResourceKey":  "empty",
                                              "childSettings":  [
                                                                ],
                                              "options":  [
                                                          ],
                                              "entityKey":  "windowsStoreBlocked",
                                              "booleanActions":  3,
                                              "defaultValue":  false,
                                              "policyType":  79,
                                              "enabled":  true
                                          },
                                          {
                                              "dataType":  0,
                                              "category":  7,
                                              "nameResourceKey":  "blockAppStoreAutoUpdate",
                                              "descriptionResourceKey":  "blockAppStoreAutoUpdateDescription",
                                              "childSettings":  [
                                                                ],
                                              "options":  [
                                                          ],
                                              "entityKey":  "windowsStoreBlockAutoUpdate",
                                              "booleanActions":  3,
                                              "defaultValue":  false,
                                              "policyType":  79,
                                              "enabled":  true
                                          },
                                          {
                                              "dataType":  16,
                                              "category":  7,
                                              "nameResourceKey":  "allowAllTrustedAppsSideloading",
                                              "descriptionResourceKey":  "allowAllTrustedAppsSideloadingDescription",
                                              "childSettings":  [
                                                                ],
                                              "options":  [
                                                              {
                                                                  "nameResourceKey":  "notConfigured",
                                                                  "value":  "notConfigured",
                                                                  "enabled":  true
                                                              },
                                                              {
                                                                  "nameResourceKey":  "blockOption",
                                                                  "value":  "blocked",
                                                                  "enabled":  true
                                                              },
                                                              {
                                                                  "nameResourceKey":  "allowOption",
                                                                  "value":  "allowed",
                                                                  "enabled":  true
                                                              }
                                                          ],
                                              "entityKey":  "appsAllowTrustedAppsSideloading",
                                              "booleanActions":  0,
                                              "defaultValue":  "notConfigured",
                                              "unconfiguredValue":  "notConfigured",
                                              "policyType":  79,
                                              "enabled":  true
                                          },
                                          {
                                              "dataType":  16,
                                              "category":  7,
                                              "nameResourceKey":  "developerUnlock",
                                              "descriptionResourceKey":  "developerUnlockDescription",
                                              "childSettings":  [
                                                                ],
                                              "options":  [
                                                              {
                                                                  "nameResourceKey":  "notConfigured",
                                                                  "value":  "notConfigured",
                                                                  "enabled":  true
                                                              },
                                                              {
                                                                  "nameResourceKey":  "blockOption",
                                                                  "value":  "blocked",
                                                                  "enabled":  true
                                                              },
                                                              {
                                                                  "nameResourceKey":  "allowOption",
                                                                  "value":  "allowed",
                                                                  "enabled":  true
                                                              }
                                                          ],
                                              "entityKey":  "developerUnlockSetting",
                                              "booleanActions":  0,
                                              "defaultValue":  "notConfigured",
                                              "unconfiguredValue":  "notConfigured",
                                              "policyType":  79,
                                              "enabled":  true
                                          },
                                          {
                                              "dataType":  0,
                                              "category":  7,
                                              "nameResourceKey":  "allowSharedUserAppData",
                                              "descriptionResourceKey":  "allowSharedUserAppDataDescription",
                                              "childSettings":  [
                                                                ],
                                              "options":  [
                                                          ],
                                              "entityKey":  "sharedUserAppDataAllowed",
                                              "booleanActions":  0,
                                              "defaultValue":  false,
                                              "policyType":  79,
                                              "enabled":  true
                                          },
                                          {
                                              "dataType":  0,
                                              "category":  7,
                                              "nameResourceKey":  "enableUsePrivateStoreOnly",
                                              "descriptionResourceKey":  "enableUsePrivateStoreOnlyDescription",
                                              "childSettings":  [
                                                                ],
                                              "options":  [
                                                          ],
                                              "entityKey":  "windowsStoreEnablePrivateStoreOnly",
                                              "booleanActions":  0,
                                              "defaultValue":  false,
                                              "policyType":  79,
                                              "enabled":  true
                                          },
                                          {
                                              "dataType":  0,
                                              "category":  7,
                                              "nameResourceKey":  "blockStoreOriginatedApps",
                                              "descriptionResourceKey":  "blockStoreOriginatedAppsDescription",
                                              "childSettings":  [
                                                                ],
                                              "options":  [
                                                          ],
                                              "entityKey":  "appsBlockWindowsStoreOriginatedApps",
                                              "booleanActions":  3,
                                              "defaultValue":  false,
                                              "policyType":  79,
                                              "enabled":  true
                                          },
                                          {
                                              "dataType":  0,
                                              "category":  7,
                                              "nameResourceKey":  "restrictAppDataToSystemVolume",
                                              "descriptionResourceKey":  "restrictAppDataToSystemVolumeDescription",
                                              "childSettings":  [
                                                                ],
                                              "options":  [
                                                          ],
                                              "entityKey":  "storageRestrictAppDataToSystemVolume",
                                              "booleanActions":  3,
                                              "defaultValue":  false,
                                              "policyType":  79,
                                              "enabled":  true
                                          },
                                          {
                                              "dataType":  0,
                                              "category":  7,
                                              "nameResourceKey":  "restrictAppInstallToSystemVolume",
                                              "descriptionResourceKey":  "restrictAppInstallToSystemVolumeDescription",
                                              "childSettings":  [
                                                                ],
                                              "options":  [
                                                          ],
                                              "entityKey":  "storageRestrictAppInstallToSystemVolume",
                                              "booleanActions":  3,
                                              "defaultValue":  false,
                                              "policyType":  79,
                                              "enabled":  true
                                          },
                                          {
                                              "dataType":  0,
                                              "category":  7,
                                              "nameResourceKey":  "blockGameDvr",
                                              "descriptionResourceKey":  "blockGameDvrDescription",
                                              "childSettings":  [
                                                                ],
                                              "options":  [
                                                          ],
                                              "entityKey":  "gameDvrBlocked",
                                              "booleanActions":  3,
                                              "defaultValue":  false,
                                              "policyType":  79,
                                              "enabled":  true
                                          },
                                          {
                                              "dataType":  0,
                                              "category":  7,
                                              "nameResourceKey":  "enableAppInstallControlName",
                                              "descriptionResourceKey":  "enableAppInstallControlDescription",
                                              "childSettings":  [
                                                                ],
                                              "options":  [
                                                          ],
                                              "entityKey":  "smartScreenEnableAppInstallControl",
                                              "booleanActions":  1,
                                              "defaultValue":  false,
                                              "policyType":  79,
                                              "enabled":  false
                                          },
                                          {
                                              "dataType":  16,
                                              "category":  7,
                                              "nameResourceKey":  "smartScreenAppInstallControlName",
                                              "descriptionResourceKey":  "smartScreenAppInstallControlDescription",
                                              "childSettings":  [
                                                                ],
                                              "options":  [
                                                              {
                                                                  "nameResourceKey":  "smartScreenAppInstallControlNotConfigured",
                                                                  "value":  "notConfigured",
                                                                  "enabled":  true
                                                              },
                                                              {
                                                                  "nameResourceKey":  "smartScreenAppInstallControlAnywhere",
                                                                  "value":  "anywhere",
                                                                  "enabled":  true
                                                              },
                                                              {
                                                                  "nameResourceKey":  "smartScreenAppInstallControlStoreOnly",
                                                                  "value":  "storeOnly",
                                                                  "enabled":  true
                                                              },
                                                              {
                                                                  "nameResourceKey":  "smartScreenAppInstallControlRecommendations",
                                                                  "value":  "recommendations",
                                                                  "enabled":  true
                                                              },
                                                              {
                                                                  "nameResourceKey":  "smartScreenAppInstallControlPreferStore",
                                                                  "value":  "preferStore",
                                                                  "enabled":  true
                                                              }
                                                          ],
                                              "entityKey":  "smartScreenAppInstallControl",
                                              "booleanActions":  0,
                                              "defaultValue":  "notConfigured",
                                              "policyType":  79,
                                              "enabled":  true
                                          },
                                          {
                                              "dataType":  19,
                                              "category":  7,
                                              "nameResourceKey":  "appManagementMSIAllowUserControlOverInstallName",
                                              "descriptionResourceKey":  "appManagementMSIAllowUserControlOverInstallDesc",
                                              "childSettings":  [
                                                                ],
                                              "options":  [
                                                              {
                                                                  "nameResourceKey":  "blockOption",
                                                                  "value":  true,
                                                                  "enabled":  true
                                                              },
                                                              {
                                                                  "nameResourceKey":  "notConfigured",
                                                                  "value":  false,
                                                                  "enabled":  true
                                                              }
                                                          ],
                                              "entityKey":  "appManagementMSIAllowUserControlOverInstall",
                                              "booleanActions":  0,
                                              "defaultValue":  false,
                                              "unconfiguredValue":  false,
                                              "policyType":  79,
                                              "enabled":  true
                                          },
                                          {
                                              "dataType":  19,
                                              "category":  7,
                                              "nameResourceKey":  "appManagementMSIAlwaysInstallWithElevatedPrivilegesName",
                                              "descriptionResourceKey":  "appManagementMSIAlwaysInstallWithElevatedPrivilegesDesc",
                                              "childSettings":  [
                                                                ],
                                              "options":  [
                                                              {
                                                                  "nameResourceKey":  "blockOption",
                                                                  "value":  true,
                                                                  "enabled":  true
                                                              },
                                                              {
                                                                  "nameResourceKey":  "notConfigured",
                                                                  "value":  false,
                                                                  "enabled":  true
                                                              }
                                                          ],
                                              "entityKey":  "appManagementMSIAlwaysInstallWithElevatedPrivileges",
                                              "booleanActions":  0,
                                              "defaultValue":  false,
                                              "unconfiguredValue":  false,
                                              "policyType":  79,
                                              "enabled":  true
                                          },
                                          {
                                              "dataType":  12,
                                              "category":  7,
                                              "nameResourceKey":  "appManagementPackageFamilyNamesToLaunchAfterLogOnName",
                                              "descriptionResourceKey":  "appManagementPackageFamilyNamesToLaunchAfterLogOnDescription",
                                              "emptyValueResourceKey":  "appManagementPackageFamilyNamesToLaunchAfterLogOnPlaceholder",
                                              "childSettings":  [
                                                                ],
                                              "options":  [
                                                          ],
                                              "entityKey":  "appManagementPackageFamilyNamesToLaunchAfterLogOn",
                                              "booleanActions":  0,
                                              "defaultValue":  "",
                                              "policyType":  79,
                                              "enabled":  true
                                          }
                                      ]
 }
--- a/Documentation/ObjectInfo/applications_windowsphonegeneral.json
+++ b/Documentation/ObjectInfo/applications_windowsphonegeneral.json
@@ -1,19 +0,0 @@
 {
    "applications_windowsphonegeneral":  {
                                             "dataType":  0,
                                             "category":  7,
                                             "nameResourceKey":  "blockApplicationStoreName",
                                             "descriptionResourceKey":  "empty",
                                             "childSettings":  [
                                                               ],
                                             "options":  [
                                                         ],
                                             "entityKey":  "windowsStoreBlocked",
                                             "booleanActions":  3,
                                             "defaultValue":  false,
                                             "policyType":  101,
                                             "enabled":  true
                                         }
 }
--- a/Documentation/ObjectInfo/applicationsandgames_iosgeneral.json
+++ b/Documentation/ObjectInfo/applicationsandgames_iosgeneral.json
--- a/Documentation/ObjectInfo/applicationsandgames_macgeneral.json
+++ b/Documentation/ObjectInfo/applicationsandgames_macgeneral.json
@@ -1,69 +0,0 @@
 {
    "applicationsandgames_macgeneral":  {
                                            "isSettingDescription":  false,
                                            "showAsSectionHeader":  true,
                                            "dataType":  8,
                                            "category":  8,
                                            "nameResourceKey":  "automatedDeviceEnrollmentHeaderNameMac",
                                            "descriptionResourceKey":  "automatedDeviceEnrollmentHeaderDescriptionMac",
                                            "childSettings":  [
                                                                  {
                                                                      "dataType":  0,
                                                                      "category":  8,
                                                                      "nameResourceKey":  "addingGameCenterFriendsBlockedMacName",
                                                                      "descriptionResourceKey":  "addingGameCenterFriendsBlockedMacDescription",
                                                                      "childSettings":  [
                                                                                        ],
                                                                      "options":  [
                                                                                  ],
                                                                      "entityKey":  "addingGameCenterFriendsBlocked",
                                                                      "booleanActions":  9,
                                                                      "defaultValue":  false,
                                                                      "policyType":  61,
                                                                      "enabled":  true
                                                                  },
                                                                  {
                                                                      "dataType":  0,
                                                                      "category":  8,
                                                                      "nameResourceKey":  "gameCenterBlockedMacName",
                                                                      "descriptionResourceKey":  "gameCenterBlockedMacDescription",
                                                                      "childSettings":  [
                                                                                        ],
                                                                      "options":  [
                                                                                  ],
                                                                      "entityKey":  "gameCenterBlocked",
                                                                      "booleanActions":  9,
                                                                      "defaultValue":  false,
                                                                      "policyType":  61,
                                                                      "enabled":  true
                                                                  },
                                                                  {
                                                                      "dataType":  0,
                                                                      "category":  8,
                                                                      "nameResourceKey":  "multiplayerGamingBlockedMacName",
                                                                      "descriptionResourceKey":  "multiplayerGamingBlockedMacDescription",
                                                                      "childSettings":  [
                                                                                        ],
                                                                      "options":  [
                                                                                  ],
                                                                      "entityKey":  "multiplayerGamingBlocked",
                                                                      "booleanActions":  9,
                                                                      "defaultValue":  false,
                                                                      "policyType":  61,
                                                                      "enabled":  true
                                                                  }
                                                              ],
                                            "options":  [
                                                        ],
                                            "booleanActions":  0,
                                            "policyType":  61,
                                            "enabled":  true
                                        }
 }
--- a/Documentation/ObjectInfo/applicationsandgoogle_androidgeneral.json
+++ b/Documentation/ObjectInfo/applicationsandgoogle_androidgeneral.json
@@ -1,19 +0,0 @@
 {
    "applicationsandgoogle_androidgeneral":  {
                                                 "dataType":  0,
                                                 "category":  9,
                                                 "nameResourceKey":  "blockGooglePlayStoreName",
                                                 "descriptionResourceKey":  "blockGooglePlayStoreDescription",
                                                 "childSettings":  [
                                                                   ],
                                                 "options":  [
                                                             ],
                                                 "entityKey":  "googlePlayStoreBlocked",
                                                 "booleanActions":  3,
                                                 "defaultValue":  false,
                                                 "policyType":  20,
                                                 "enabled":  true
                                             }
 }
--- a/Documentation/ObjectInfo/applicationvisibility_iosgeneral.json
+++ b/Documentation/ObjectInfo/applicationvisibility_iosgeneral.json
@@ -1,159 +0,0 @@
 {
    "applicationvisibility_iosgeneral":  [
                                             {
                                                 "isSettingDescription":  false,
                                                 "showAsSectionHeader":  false,
                                                 "dataType":  8,
                                                 "category":  6,
                                                 "nameResourceKey":  "IosGeneralApplicationVisibilityHeader",
                                                 "childSettings":  [
                                                                   ],
                                                 "options":  [
                                                             ],
                                                 "booleanActions":  0,
                                                 "policyType":  46,
                                                 "enabled":  true
                                             },
                                             {
                                                 "isSettingDescription":  false,
                                                 "showAsSectionHeader":  true,
                                                 "dataType":  8,
                                                 "category":  6,
                                                 "nameResourceKey":  "automatedDeviceEnrollmentHeaderName",
                                                 "descriptionResourceKey":  "automatedDeviceEnrollmentHeaderDescription",
                                                 "childSettings":  [
                                                                       {
                                                                           "dataType":  16,
                                                                           "category":  6,
                                                                           "nameResourceKey":  "visibleAppsListOptionsName",
                                                                           "descriptionResourceKey":  "visibleAppsListOptionsDescription",
                                                                           "childSettings":  [
                                                                                                 {
                                                                                                     "columns":  [
                                                                                                                     {
                                                                                                                         "metadata":  {
                                                                                                                                          "dataType":  20,
                                                                                                                                          "category":  6,
                                                                                                                                          "nameResourceKey":  "appUrlName",
                                                                                                                                          "descriptionResourceKey":  "empty",
                                                                                                                                          "emptyValueResourceKey":  "kioskModeAppStoreExample",
                                                                                                                                          "childSettings":  [
                                                                                                                                                            ],
                                                                                                                                          "options":  [
                                                                                                                                                      ],
                                                                                                                                          "entityKey":  "appStoreUrl",
                                                                                                                                          "booleanActions":  0,
                                                                                                                                          "policyType":  46,
                                                                                                                                          "enabled":  true
                                                                                                                                      }
                                                                                                                     },
                                                                                                                     {
                                                                                                                         "metadata":  {
                                                                                                                                          "dataType":  20,
                                                                                                                                          "category":  6,
                                                                                                                                          "nameResourceKey":  "appBundleIdColumn",
                                                                                                                                          "descriptionResourceKey":  "empty",
                                                                                                                                          "emptyValueResourceKey":  "bundleIdExample",
                                                                                                                                          "childSettings":  [
                                                                                                                                                            ],
                                                                                                                                          "options":  [
                                                                                                                                                      ],
                                                                                                                                          "entityKey":  "appId",
                                                                                                                                          "booleanActions":  0,
                                                                                                                                          "policyType":  46,
                                                                                                                                          "enabled":  true
                                                                                                                                      }
                                                                                                                     },
                                                                                                                     {
                                                                                                                         "metadata":  {
                                                                                                                                          "dataType":  20,
                                                                                                                                          "category":  6,
                                                                                                                                          "nameResourceKey":  "appNameName",
                                                                                                                                          "descriptionResourceKey":  "empty",
                                                                                                                                          "childSettings":  [
                                                                                                                                                            ],
                                                                                                                                          "options":  [
                                                                                                                                                      ],
                                                                                                                                          "entityKey":  "name",
                                                                                                                                          "booleanActions":  0,
                                                                                                                                          "policyType":  46,
                                                                                                                                          "enabled":  true
                                                                                                                                      }
                                                                                                                     },
                                                                                                                     {
                                                                                                                         "metadata":  {
                                                                                                                                          "dataType":  20,
                                                                                                                                          "category":  6,
                                                                                                                                          "nameResourceKey":  "appPublisherName",
                                                                                                                                          "descriptionResourceKey":  "empty",
                                                                                                                                          "childSettings":  [
                                                                                                                                                            ],
                                                                                                                                          "options":  [
                                                                                                                                                      ],
                                                                                                                                          "entityKey":  "publisher",
                                                                                                                                          "booleanActions":  0,
                                                                                                                                          "policyType":  46,
                                                                                                                                          "enabled":  true
                                                                                                                                      }
                                                                                                                     }
                                                                                                                 ],
                                                                                                     "dataType":  21,
                                                                                                     "category":  6,
                                                                                                     "nameResourceKey":  "appListTableName",
                                                                                                     "descriptionResourceKey":  "iosAppUrlHelp",
                                                                                                     "childSettings":  [
                                                                                                                       ],
                                                                                                     "options":  [
                                                                                                                 ],
                                                                                                     "entityKey":  "appsVisibilityList",
                                                                                                     "booleanActions":  0,
                                                                                                     "policyType":  46,
                                                                                                     "enabled":  true
                                                                                                 }
                                                                                             ],
                                                                           "options":  [
                                                                                           {
                                                                                               "nameResourceKey":  "notConfigured",
                                                                                               "value":  "none",
                                                                                               "enabled":  true
                                                                                           },
                                                                                           {
                                                                                               "nameResourceKey":  "hideAppsList",
                                                                                               "value":  "appsNotInListCompliant",
                                                                                               "enabled":  true
                                                                                           },
                                                                                           {
                                                                                               "nameResourceKey":  "showAppsList",
                                                                                               "value":  "appsInListCompliant",
                                                                                               "enabled":  true
                                                                                           }
                                                                                       ],
                                                                           "entityKey":  "appsVisibilityListType",
                                                                           "booleanActions":  0,
                                                                           "defaultValue":  "none",
                                                                           "unconfiguredValue":  "none",
                                                                           "policyType":  46,
                                                                           "enabled":  true
                                                                       }
                                                                   ],
                                                 "options":  [
                                                             ],
                                                 "booleanActions":  0,
                                                 "policyType":  46,
                                                 "enabled":  true
                                             }
                                         ]
 }
--- a/Documentation/ObjectInfo/appmanagement_androidgeneral.json
+++ b/Documentation/ObjectInfo/appmanagement_androidgeneral.json
@@ -1,398 +0,0 @@
 {
    "appmanagement_androidgeneral":  [
                                         {
                                             "isSettingDescription":  false,
                                             "showAsSectionHeader":  false,
                                             "dataType":  8,
                                             "category":  10,
                                             "nameResourceKey":  "androidAppManagementHeaderName",
                                             "childSettings":  [
                                                               ],
                                             "options":  [
                                                         ],
                                             "booleanActions":  0,
                                             "policyType":  20,
                                             "enabled":  true
                                         },
                                         {
                                             "dataType":  9,
                                             "category":  10,
                                             "childSettings":  [
                                                                   {
                                                                       "complexOptions":  [
                                                                                              {
                                                                                                  "isSettingDescription":  false,
                                                                                                  "showAsSectionHeader":  false,
                                                                                                  "dataType":  8,
                                                                                                  "category":  10,
                                                                                                  "nameResourceKey":  "androidAppsAllowedToBeInstalledtHeaderName",
                                                                                                  "childSettings":  [
                                                                                                                    ],
                                                                                                  "options":  [
                                                                                                              ],
                                                                                                  "booleanActions":  0,
                                                                                                  "policyType":  20,
                                                                                                  "enabled":  true
                                                                                              },
                                                                                              {
                                                                                                  "columns":  [
                                                                                                                  {
                                                                                                                      "metadata":  {
                                                                                                                                       "dataType":  20,
                                                                                                                                       "category":  10,
                                                                                                                                       "nameResourceKey":  "singleAppModeAppNameName",
                                                                                                                                       "descriptionResourceKey":  "Empty",
                                                                                                                                       "childSettings":  [
                                                                                                                                                         ],
                                                                                                                                       "options":  [
                                                                                                                                                   ],
                                                                                                                                       "entityKey":  "name",
                                                                                                                                       "booleanActions":  0,
                                                                                                                                       "policyType":  20,
                                                                                                                                       "enabled":  true
                                                                                                                                   }
                                                                                                                  },
                                                                                                                  {
                                                                                                                      "metadata":  {
                                                                                                                                       "dataType":  20,
                                                                                                                                       "category":  10,
                                                                                                                                       "nameResourceKey":  "packageName",
                                                                                                                                       "descriptionResourceKey":  "Empty",
                                                                                                                                       "childSettings":  [
                                                                                                                                                         ],
                                                                                                                                       "options":  [
                                                                                                                                                   ],
                                                                                                                                       "entityKey":  "appId",
                                                                                                                                       "booleanActions":  0,
                                                                                                                                       "policyType":  20,
                                                                                                                                       "enabled":  true
                                                                                                                                   }
                                                                                                                  },
                                                                                                                  {
                                                                                                                      "metadata":  {
                                                                                                                                       "dataType":  20,
                                                                                                                                       "category":  10,
                                                                                                                                       "nameResourceKey":  "appUrlName",
                                                                                                                                       "descriptionResourceKey":  "Empty",
                                                                                                                                       "childSettings":  [
                                                                                                                                                         ],
                                                                                                                                       "options":  [
                                                                                                                                                   ],
                                                                                                                                       "entityKey":  "appStoreUrl",
                                                                                                                                       "booleanActions":  0,
                                                                                                                                       "policyType":  20,
                                                                                                                                       "enabled":  true
                                                                                                                                   }
                                                                                                                  },
                                                                                                                  {
                                                                                                                      "metadata":  {
                                                                                                                                       "dataType":  20,
                                                                                                                                       "category":  10,
                                                                                                                                       "nameResourceKey":  "appPublisherName",
                                                                                                                                       "descriptionResourceKey":  "Empty",
                                                                                                                                       "childSettings":  [
                                                                                                                                                         ],
                                                                                                                                       "options":  [
                                                                                                                                                   ],
                                                                                                                                       "entityKey":  "publisher",
                                                                                                                                       "booleanActions":  0,
                                                                                                                                       "policyType":  20,
                                                                                                                                       "enabled":  true
                                                                                                                                   }
                                                                                                                  }
                                                                                                              ],
                                                                                                  "dataType":  21,
                                                                                                  "category":  10,
                                                                                                  "nameResourceKey":  "Empty",
                                                                                                  "descriptionResourceKey":  "Empty",
                                                                                                  "childSettings":  [
                                                                                                                    ],
                                                                                                  "options":  [
                                                                                                              ],
                                                                                                  "entityKey":  "appsInstallAllowList",
                                                                                                  "booleanActions":  0,
                                                                                                  "policyType":  20,
                                                                                                  "enabled":  true
                                                                                              }
                                                                                          ],
                                                                       "dataType":  5,
                                                                       "category":  10,
                                                                       "nameResourceKey":  "androidAppsAllowedToBeInstalled",
                                                                       "childSettings":  [
                                                                                         ],
                                                                       "options":  [
                                                                                   ],
                                                                       "booleanActions":  0,
                                                                       "policyType":  20,
                                                                       "enabled":  true
                                                                   },
                                                                   {
                                                                       "complexOptions":  [
                                                                                              {
                                                                                                  "isSettingDescription":  false,
                                                                                                  "showAsSectionHeader":  false,
                                                                                                  "dataType":  8,
                                                                                                  "category":  10,
                                                                                                  "nameResourceKey":  "androidAppsBlockedFromLaunchHeaderName",
                                                                                                  "childSettings":  [
                                                                                                                    ],
                                                                                                  "options":  [
                                                                                                              ],
                                                                                                  "booleanActions":  0,
                                                                                                  "policyType":  20,
                                                                                                  "enabled":  true
                                                                                              },
                                                                                              {
                                                                                                  "columns":  [
                                                                                                                  {
                                                                                                                      "metadata":  {
                                                                                                                                       "dataType":  20,
                                                                                                                                       "category":  10,
                                                                                                                                       "nameResourceKey":  "singleAppModeAppNameName",
                                                                                                                                       "descriptionResourceKey":  "Empty",
                                                                                                                                       "childSettings":  [
                                                                                                                                                         ],
                                                                                                                                       "options":  [
                                                                                                                                                   ],
                                                                                                                                       "entityKey":  "name",
                                                                                                                                       "booleanActions":  0,
                                                                                                                                       "policyType":  20,
                                                                                                                                       "enabled":  true
                                                                                                                                   }
                                                                                                                  },
                                                                                                                  {
                                                                                                                      "metadata":  {
                                                                                                                                       "dataType":  20,
                                                                                                                                       "category":  10,
                                                                                                                                       "nameResourceKey":  "packageName",
                                                                                                                                       "descriptionResourceKey":  "Empty",
                                                                                                                                       "childSettings":  [
                                                                                                                                                         ],
                                                                                                                                       "options":  [
                                                                                                                                                   ],
                                                                                                                                       "entityKey":  "appId",
                                                                                                                                       "booleanActions":  0,
                                                                                                                                       "policyType":  20,
                                                                                                                                       "enabled":  true
                                                                                                                                   }
                                                                                                                  },
                                                                                                                  {
                                                                                                                      "metadata":  {
                                                                                                                                       "dataType":  20,
                                                                                                                                       "category":  10,
                                                                                                                                       "nameResourceKey":  "appUrlName",
                                                                                                                                       "descriptionResourceKey":  "Empty",
                                                                                                                                       "childSettings":  [
                                                                                                                                                         ],
                                                                                                                                       "options":  [
                                                                                                                                                   ],
                                                                                                                                       "entityKey":  "appStoreUrl",
                                                                                                                                       "booleanActions":  0,
                                                                                                                                       "policyType":  20,
                                                                                                                                       "enabled":  true
                                                                                                                                   }
                                                                                                                  },
                                                                                                                  {
                                                                                                                      "metadata":  {
                                                                                                                                       "dataType":  20,
                                                                                                                                       "category":  10,
                                                                                                                                       "nameResourceKey":  "appPublisherName",
                                                                                                                                       "descriptionResourceKey":  "Empty",
                                                                                                                                       "childSettings":  [
                                                                                                                                                         ],
                                                                                                                                       "options":  [
                                                                                                                                                   ],
                                                                                                                                       "entityKey":  "publisher",
                                                                                                                                       "booleanActions":  0,
                                                                                                                                       "policyType":  20,
                                                                                                                                       "enabled":  true
                                                                                                                                   }
                                                                                                                  }
                                                                                                              ],
                                                                                                  "dataType":  21,
                                                                                                  "category":  10,
                                                                                                  "nameResourceKey":  "Empty",
                                                                                                  "descriptionResourceKey":  "Empty",
                                                                                                  "childSettings":  [
                                                                                                                    ],
                                                                                                  "options":  [
                                                                                                              ],
                                                                                                  "entityKey":  "appsLaunchBlockList",
                                                                                                  "booleanActions":  0,
                                                                                                  "policyType":  20,
                                                                                                  "enabled":  true
                                                                                              }
                                                                                          ],
                                                                       "dataType":  5,
                                                                       "category":  10,
                                                                       "nameResourceKey":  "androidAppsBlockedFromLaunch",
                                                                       "childSettings":  [
                                                                                         ],
                                                                       "options":  [
                                                                                   ],
                                                                       "booleanActions":  0,
                                                                       "policyType":  20,
                                                                       "enabled":  true
                                                                   },
                                                                   {
                                                                       "complexOptions":  [
                                                                                              {
                                                                                                  "isSettingDescription":  false,
                                                                                                  "showAsSectionHeader":  false,
                                                                                                  "dataType":  8,
                                                                                                  "category":  10,
                                                                                                  "nameResourceKey":  "androidHiddenAppsHeaderName",
                                                                                                  "childSettings":  [
                                                                                                                    ],
                                                                                                  "options":  [
                                                                                                              ],
                                                                                                  "booleanActions":  0,
                                                                                                  "policyType":  20,
                                                                                                  "enabled":  true
                                                                                              },
                                                                                              {
                                                                                                  "columns":  [
                                                                                                                  {
                                                                                                                      "metadata":  {
                                                                                                                                       "dataType":  20,
                                                                                                                                       "category":  10,
                                                                                                                                       "nameResourceKey":  "singleAppModeAppNameName",
                                                                                                                                       "descriptionResourceKey":  "Empty",
                                                                                                                                       "childSettings":  [
                                                                                                                                                         ],
                                                                                                                                       "options":  [
                                                                                                                                                   ],
                                                                                                                                       "entityKey":  "name",
                                                                                                                                       "booleanActions":  0,
                                                                                                                                       "policyType":  20,
                                                                                                                                       "enabled":  true
                                                                                                                                   }
                                                                                                                  },
                                                                                                                  {
                                                                                                                      "metadata":  {
                                                                                                                                       "dataType":  20,
                                                                                                                                       "category":  10,
                                                                                                                                       "nameResourceKey":  "packageName",
                                                                                                                                       "descriptionResourceKey":  "Empty",
                                                                                                                                       "childSettings":  [
                                                                                                                                                         ],
                                                                                                                                       "options":  [
                                                                                                                                                   ],
                                                                                                                                       "entityKey":  "appId",
                                                                                                                                       "booleanActions":  0,
                                                                                                                                       "policyType":  20,
                                                                                                                                       "enabled":  true
                                                                                                                                   }
                                                                                                                  },
                                                                                                                  {
                                                                                                                      "metadata":  {
                                                                                                                                       "dataType":  20,
                                                                                                                                       "category":  10,
                                                                                                                                       "nameResourceKey":  "appUrlName",
                                                                                                                                       "descriptionResourceKey":  "Empty",
                                                                                                                                       "childSettings":  [
                                                                                                                                                         ],
                                                                                                                                       "options":  [
                                                                                                                                                   ],
                                                                                                                                       "entityKey":  "appStoreUrl",
                                                                                                                                       "booleanActions":  0,
                                                                                                                                       "policyType":  20,
                                                                                                                                       "enabled":  true
                                                                                                                                   }
                                                                                                                  },
                                                                                                                  {
                                                                                                                      "metadata":  {
                                                                                                                                       "dataType":  20,
                                                                                                                                       "category":  10,
                                                                                                                                       "nameResourceKey":  "appPublisherName",
                                                                                                                                       "descriptionResourceKey":  "Empty",
                                                                                                                                       "childSettings":  [
                                                                                                                                                         ],
                                                                                                                                       "options":  [
                                                                                                                                                   ],
                                                                                                                                       "entityKey":  "publisher",
                                                                                                                                       "booleanActions":  0,
                                                                                                                                       "policyType":  20,
                                                                                                                                       "enabled":  true
                                                                                                                                   }
                                                                                                                  }
                                                                                                              ],
                                                                                                  "dataType":  21,
                                                                                                  "category":  10,
                                                                                                  "nameResourceKey":  "Empty",
                                                                                                  "descriptionResourceKey":  "Empty",
                                                                                                  "childSettings":  [
                                                                                                                    ],
                                                                                                  "options":  [
                                                                                                              ],
                                                                                                  "entityKey":  "appsHideList",
                                                                                                  "booleanActions":  0,
                                                                                                  "policyType":  20,
                                                                                                  "enabled":  true
                                                                                              }
                                                                                          ],
                                                                       "dataType":  5,
                                                                       "category":  10,
                                                                       "nameResourceKey":  "androidHiddenApps",
                                                                       "childSettings":  [
                                                                                         ],
                                                                       "options":  [
                                                                                   ],
                                                                       "booleanActions":  0,
                                                                       "policyType":  20,
                                                                       "enabled":  true
                                                                   }
                                                               ],
                                             "options":  [
                                                         ],
                                             "booleanActions":  0,
                                             "policyType":  20,
                                             "enabled":  true
                                         }
                                     ]
 }
--- a/Documentation/ObjectInfo/appsandexperience_windows10teamgeneral.json
+++ b/Documentation/ObjectInfo/appsandexperience_windows10teamgeneral.json
@@ -1,121 +0,0 @@
 {
    "appsandexperience_windows10teamgeneral":  [
                                                   {
                                                       "dataType":  0,
                                                       "category":  11,
                                                       "nameResourceKey":  "wakeScreenWhenSomeoneInRoomName",
                                                       "descriptionResourceKey":  "empty",
                                                       "childSettings":  [
                                                                         ],
                                                       "options":  [
                                                                   ],
                                                       "entityKey":  "welcomeScreenBlockAutomaticWakeUp",
                                                       "booleanActions":  3,
                                                       "defaultValue":  false,
                                                       "policyType":  87,
                                                       "enabled":  true
                                                   },
                                                   {
                                                       "dataType":  16,
                                                       "category":  11,
                                                       "nameResourceKey":  "meetingInformationDisplayedOnWelcomeScreenName",
                                                       "descriptionResourceKey":  "empty",
                                                       "childSettings":  [
                                                                         ],
                                                       "options":  [
                                                                       {
                                                                           "nameResourceKey":  "notConfigured",
                                                                           "value":  "userDefined",
                                                                           "enabled":  true
                                                                       },
                                                                       {
                                                                           "nameResourceKey":  "showOrganizerAndTimeOnly",
                                                                           "value":  "showOrganizerAndTimeOnly",
                                                                           "enabled":  true
                                                                       },
                                                                       {
                                                                           "nameResourceKey":  "showEverything",
                                                                           "value":  "showOrganizerAndTimeAndSubject",
                                                                           "enabled":  true
                                                                       }
                                                                   ],
                                                       "entityKey":  "welcomeScreenMeetingInformation",
                                                       "booleanActions":  0,
                                                       "defaultValue":  "userDefined",
                                                       "unconfiguredValue":  "userDefined",
                                                       "policyType":  87,
                                                       "enabled":  true
                                                   },
                                                   {
                                                       "dataType":  20,
                                                       "category":  11,
                                                       "nameResourceKey":  "lockScreenBackgroundImageURLName",
                                                       "descriptionResourceKey":  "lockScreenBackgroundImageURLDescription",
                                                       "emptyValueResourceKey":  "lockScreenBackgroundImageURLExample",
                                                       "childSettings":  [
                                                                         ],
                                                       "options":  [
                                                                   ],
                                                       "entityKey":  "welcomeScreenBackgroundImageUrl",
                                                       "booleanActions":  0,
                                                       "policyType":  87,
                                                       "enabled":  true
                                                   },
                                                   {
                                                       "dataType":  0,
                                                       "category":  11,
                                                       "nameResourceKey":  "connectAppBlockAutoLaunchName",
                                                       "descriptionResourceKey":  "connectAppBlockAutoLaunchDescription",
                                                       "childSettings":  [
                                                                         ],
                                                       "options":  [
                                                                   ],
                                                       "entityKey":  "connectAppBlockAutoLaunch",
                                                       "booleanActions":  3,
                                                       "defaultValue":  false,
                                                       "policyType":  87,
                                                       "enabled":  true
                                                   },
                                                   {
                                                       "dataType":  0,
                                                       "category":  11,
                                                       "nameResourceKey":  "settingsBlockSigninSuggestionsName",
                                                       "descriptionResourceKey":  "settingsBlockSigninSuggestionsDescription",
                                                       "childSettings":  [
                                                                         ],
                                                       "options":  [
                                                                   ],
                                                       "entityKey":  "settingsBlockSigninSuggestions",
                                                       "booleanActions":  3,
                                                       "defaultValue":  false,
                                                       "policyType":  87,
                                                       "enabled":  true
                                                   },
                                                   {
                                                       "dataType":  0,
                                                       "category":  11,
                                                       "nameResourceKey":  "settingsBlockMyMeetingsAndFilesName",
                                                       "descriptionResourceKey":  "settingsBlockMyMeetingsAndFilesDescription",
                                                       "childSettings":  [
                                                                         ],
                                                       "options":  [
                                                                   ],
                                                       "entityKey":  "settingsBlockMyMeetingsAndFiles",
                                                       "booleanActions":  3,
                                                       "defaultValue":  false,
                                                       "policyType":  87,
                                                       "enabled":  true
                                                   }
                                               ]
 }
--- a/Documentation/ObjectInfo/associateddomains_macdevicefeatures.json
+++ b/Documentation/ObjectInfo/associateddomains_macdevicefeatures.json
@@ -1,130 +0,0 @@
 {
    "associateddomains_macdevicefeatures":  [
                                                {
                                                    "isSettingDescription":  false,
                                                    "showAsSectionHeader":  false,
                                                    "dataType":  8,
                                                    "category":  12,
                                                    "nameResourceKey":  "MacDeviceFeaturesAssociatedDomainsHeader",
                                                    "childSettings":  [
                                                                      ],
                                                    "options":  [
                                                                ],
                                                    "booleanActions":  0,
                                                    "policyType":  58,
                                                    "enabled":  true
                                                },
                                                {
                                                    "isSettingDescription":  false,
                                                    "showAsSectionHeader":  true,
                                                    "dataType":  8,
                                                    "category":  12,
                                                    "nameResourceKey":  "userApprovedAndAutomatedDeviceEnrollmentHeaderNameMac",
                                                    "descriptionResourceKey":  "userApprovedAndAutomatedDeviceEnrollmentHeaderDescriptionMac",
                                                    "childSettings":  [
                                                                          {
                                                                              "columns":  [
                                                                                              {
                                                                                                  "metadata":  {
                                                                                                                   "dataType":  20,
                                                                                                                   "category":  12,
                                                                                                                   "nameResourceKey":  "associatedDomainsAppIdName",
                                                                                                                   "descriptionResourceKey":  "associatedDomainsAppIdDescription",
                                                                                                                   "emptyValueResourceKey":  "associatedDomainsAppIdExample",
                                                                                                                   "childSettings":  [
                                                                                                                                     ],
                                                                                                                   "options":  [
                                                                                                                               ],
                                                                                                                   "entityKey":  "applicationIdentifier",
                                                                                                                   "booleanActions":  0,
                                                                                                                   "policyType":  58,
                                                                                                                   "enabled":  true
                                                                                                               }
                                                                                              },
                                                                                              {
                                                                                                  "metadata":  {
                                                                                                                   "columns":  [
                                                                                                                                   {
                                                                                                                                       "metadata":  {
                                                                                                                                                        "dataType":  20,
                                                                                                                                                        "category":  12,
                                                                                                                                                        "nameResourceKey":  "associatedDomainsDomainName",
                                                                                                                                                        "emptyValueResourceKey":  "associatedDomainsDomainExample",
                                                                                                                                                        "childSettings":  [
                                                                                                                                                                          ],
                                                                                                                                                        "options":  [
                                                                                                                                                                    ],
                                                                                                                                                        "entityKey":  "domains",
                                                                                                                                                        "booleanActions":  0,
                                                                                                                                                        "policyType":  58,
                                                                                                                                                        "enabled":  true
                                                                                                                                                    }
                                                                                                                                   }
                                                                                                                               ],
                                                                                                                   "dataType":  21,
                                                                                                                   "category":  12,
                                                                                                                   "nameResourceKey":  "associatedDomainsDomainsListName",
                                                                                                                   "descriptionResourceKey":  "associatedDomainsDomainsListDescription",
                                                                                                                   "childSettings":  [
                                                                                                                                     ],
                                                                                                                   "options":  [
                                                                                                                               ],
                                                                                                                   "entityKey":  "domains",
                                                                                                                   "booleanActions":  0,
                                                                                                                   "policyType":  58,
                                                                                                                   "enabled":  true
                                                                                                               }
                                                                                              },
                                                                                              {
                                                                                                  "metadata":  {
                                                                                                                   "dataType":  0,
                                                                                                                   "category":  12,
                                                                                                                   "nameResourceKey":  "associatedDomainsEnableDirectDownloadsName",
                                                                                                                   "descriptionResourceKey":  "associatedDomainsEnableDirectDownloadsDescription",
                                                                                                                   "childSettings":  [
                                                                                                                                     ],
                                                                                                                   "options":  [
                                                                                                                               ],
                                                                                                                   "entityKey":  "directDownloadsEnabled",
                                                                                                                   "booleanActions":  9,
                                                                                                                   "defaultValue":  false,
                                                                                                                   "policyType":  58,
                                                                                                                   "enabled":  true
                                                                                                               }
                                                                                              }
                                                                                          ],
                                                                              "dataType":  21,
                                                                              "category":  12,
                                                                              "nameResourceKey":  "associatedDomainsTableName",
                                                                              "descriptionResourceKey":  "associatedDomainsTableDescription",
                                                                              "childSettings":  [
                                                                                                ],
                                                                              "options":  [
                                                                                          ],
                                                                              "entityKey":  "appAssociatedDomains",
                                                                              "booleanActions":  0,
                                                                              "policyType":  58,
                                                                              "enabled":  true
                                                                          }
                                                                      ],
                                                    "options":  [
                                                                ],
                                                    "booleanActions":  0,
                                                    "policyType":  58,
                                                    "enabled":  true
                                                }
                                            ]
 }
--- a/Documentation/ObjectInfo/autonomoussingleappmode_iosgeneral.json
+++ b/Documentation/ObjectInfo/autonomoussingleappmode_iosgeneral.json
@@ -1,90 +0,0 @@
 {
    "autonomoussingleappmode_iosgeneral":  [
                                               {
                                                   "isSettingDescription":  false,
                                                   "showAsSectionHeader":  false,
                                                   "dataType":  8,
                                                   "category":  13,
                                                   "nameResourceKey":  "IosGeneralAutonomousSingleAppModeHeader",
                                                   "childSettings":  [
                                                                     ],
                                                   "options":  [
                                                               ],
                                                   "booleanActions":  0,
                                                   "policyType":  46,
                                                   "enabled":  true
                                               },
                                               {
                                                   "isSettingDescription":  false,
                                                   "showAsSectionHeader":  true,
                                                   "dataType":  8,
                                                   "category":  13,
                                                   "nameResourceKey":  "automatedDeviceEnrollmentHeaderName",
                                                   "descriptionResourceKey":  "automatedDeviceEnrollmentHeaderDescription",
                                                   "childSettings":  [
                                                                         {
                                                                             "columns":  [
                                                                                             {
                                                                                                 "metadata":  {
                                                                                                                  "dataType":  20,
                                                                                                                  "category":  13,
                                                                                                                  "nameResourceKey":  "singleAppModeAppNameName",
                                                                                                                  "descriptionResourceKey":  "singleAppModeAppNameDescription",
                                                                                                                  "childSettings":  [
                                                                                                                                    ],
                                                                                                                  "options":  [
                                                                                                                              ],
                                                                                                                  "entityKey":  "name",
                                                                                                                  "booleanActions":  0,
                                                                                                                  "policyType":  46,
                                                                                                                  "enabled":  true
                                                                                                              }
                                                                                             },
                                                                                             {
                                                                                                 "metadata":  {
                                                                                                                  "dataType":  20,
                                                                                                                  "category":  13,
                                                                                                                  "nameResourceKey":  "singleAppModeBundleIdsName",
                                                                                                                  "descriptionResourceKey":  "singleAppModeBundleIdsDescription",
                                                                                                                  "childSettings":  [
                                                                                                                                    ],
                                                                                                                  "options":  [
                                                                                                                              ],
                                                                                                                  "entityKey":  "appId",
                                                                                                                  "booleanActions":  0,
                                                                                                                  "policyType":  46,
                                                                                                                  "enabled":  true
                                                                                                              }
                                                                                             }
                                                                                         ],
                                                                             "dataType":  21,
                                                                             "category":  13,
                                                                             "nameResourceKey":  "Empty",
                                                                             "descriptionResourceKey":  "Empty",
                                                                             "childSettings":  [
                                                                                               ],
                                                                             "options":  [
                                                                                         ],
                                                                             "entityKey":  "appsSingleAppModeList",
                                                                             "booleanActions":  0,
                                                                             "policyType":  46,
                                                                             "enabled":  true
                                                                         }
                                                                     ],
                                                   "options":  [
                                                               ],
                                                   "booleanActions":  0,
                                                   "policyType":  46,
                                                   "enabled":  true
                                               }
                                           ]
 }
--- a/Documentation/ObjectInfo/azureoperationalinsights_windows10teamgeneral.json
+++ b/Documentation/ObjectInfo/azureoperationalinsights_windows10teamgeneral.json
@@ -1,50 +0,0 @@
 {
    "azureoperationalinsights_windows10teamgeneral":  {
                                                          "dataType":  0,
                                                          "category":  14,
                                                          "nameResourceKey":  "azureOperationalInsightsName",
                                                          "descriptionResourceKey":  "azureOperationalInsightsDescription",
                                                          "childSettings":  [
                                                                                {
                                                                                    "dataType":  20,
                                                                                    "category":  14,
                                                                                    "nameResourceKey":  "workspaceIDName",
                                                                                    "descriptionResourceKey":  "empty",
                                                                                    "childSettings":  [
                                                                                                      ],
                                                                                    "options":  [
                                                                                                ],
                                                                                    "entityKey":  "azureOperationalInsightsWorkspaceId",
                                                                                    "booleanActions":  0,
                                                                                    "policyType":  87,
                                                                                    "enabled":  true
                                                                                },
                                                                                {
                                                                                    "dataType":  20,
                                                                                    "category":  14,
                                                                                    "nameResourceKey":  "workspaceKeyName",
                                                                                    "descriptionResourceKey":  "empty",
                                                                                    "childSettings":  [
                                                                                                      ],
                                                                                    "options":  [
                                                                                                ],
                                                                                    "entityKey":  "azureOperationalInsightsWorkspaceKey",
                                                                                    "booleanActions":  0,
                                                                                    "policyType":  87,
                                                                                    "enabled":  true
                                                                                }
                                                                            ],
                                                          "options":  [
                                                                      ],
                                                          "entityKey":  "syntheticAzureOperationalInsightsEnabled",
                                                          "booleanActions":  2,
                                                          "defaultValue":  false,
                                                          "policyType":  87,
                                                          "enabled":  true
                                                      }
 }
--- a/Documentation/ObjectInfo/bitlocker_windows10endpointprotection.json
+++ b/Documentation/ObjectInfo/bitlocker_windows10endpointprotection.json
--- a/Documentation/ObjectInfo/bootoptions_windows10devicefirmwareconfigurationinterface.json
+++ b/Documentation/ObjectInfo/bootoptions_windows10devicefirmwareconfigurationinterface.json
@@ -1,68 +0,0 @@
 {
    "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
                                                                      }
                                                                  ]
 }
--- a/Documentation/ObjectInfo/browser_androidgeneral.json
+++ b/Documentation/ObjectInfo/browser_androidgeneral.json
@@ -1,111 +0,0 @@
 {
    "browser_androidgeneral":  {
                                   "dataType":  0,
                                   "category":  17,
                                   "nameResourceKey":  "knoxBlockWebBrowserName",
                                   "descriptionResourceKey":  "knoxBlockWebBrowserDescription",
                                   "childSettings":  [
                                                         {
                                                             "dataType":  0,
                                                             "category":  17,
                                                             "nameResourceKey":  "knoxBlockAutofillName",
                                                             "descriptionResourceKey":  "knoxBlockAutofillDescription",
                                                             "childSettings":  [
                                                                               ],
                                                             "options":  [
                                                                         ],
                                                             "entityKey":  "webBrowserBlockAutofill",
                                                             "booleanActions":  3,
                                                             "defaultValue":  false,
                                                             "policyType":  20,
                                                             "enabled":  true
                                                         },
                                                         {
                                                             "dataType":  16,
                                                             "category":  17,
                                                             "nameResourceKey":  "knoxBlockCookiesName",
                                                             "descriptionResourceKey":  "KnoxBlockCookiesDescription",
                                                             "childSettings":  [
                                                                               ],
                                                             "options":  [
                                                                             {
                                                                                 "nameResourceKey":  "notConfigured",
                                                                                 "value":  "browserDefault",
                                                                                 "enabled":  true
                                                                             },
                                                                             {
                                                                                 "nameResourceKey":  "allowOption",
                                                                                 "value":  "allowAlways",
                                                                                 "enabled":  true
                                                                             },
                                                                             {
                                                                                 "nameResourceKey":  "blockAllCookiesOption",
                                                                                 "value":  "blockAlways",
                                                                                 "enabled":  true
                                                                             },
                                                                             {
                                                                                 "nameResourceKey":  "allowVisitedSitesCookiesOption",
                                                                                 "value":  "allowFromWebsitesVisited",
                                                                                 "enabled":  true
                                                                             },
                                                                             {
                                                                                 "nameResourceKey":  "allowCurrentWebSiteCookiesOption",
                                                                                 "value":  "allowCurrentWebSite",
                                                                                 "enabled":  true
                                                                             }
                                                                         ],
                                                             "entityKey":  "webBrowserCookieSettings",
                                                             "booleanActions":  0,
                                                             "defaultValue":  "browserDefault",
                                                             "unconfiguredValue":  "browserDefault",
                                                             "policyType":  20,
                                                             "enabled":  true
                                                         },
                                                         {
                                                             "dataType":  0,
                                                             "category":  17,
                                                             "nameResourceKey":  "knoxBlockJavaScriptName",
                                                             "descriptionResourceKey":  "knoxBlockJavaScriptDescription",
                                                             "childSettings":  [
                                                                               ],
                                                             "options":  [
                                                                         ],
                                                             "entityKey":  "webBrowserBlockJavaScript",
                                                             "booleanActions":  3,
                                                             "defaultValue":  false,
                                                             "policyType":  20,
                                                             "enabled":  true
                                                         },
                                                         {
                                                             "dataType":  0,
                                                             "category":  17,
                                                             "nameResourceKey":  "knoxBlockPopUpsName",
                                                             "descriptionResourceKey":  "knoxBlockPopUpsDescription",
                                                             "childSettings":  [
                                                                               ],
                                                             "options":  [
                                                                         ],
                                                             "entityKey":  "webBrowserBlockPopups",
                                                             "booleanActions":  3,
                                                             "defaultValue":  false,
                                                             "policyType":  20,
                                                             "enabled":  true
                                                         }
                                                     ],
                                   "options":  [
                                               ],
                                   "entityKey":  "webBrowserBlocked",
                                   "booleanActions":  3,
                                   "defaultValue":  false,
                                   "policyType":  20,
                                   "enabled":  true
                               }
 }
--- a/Documentation/ObjectInfo/browser_windows8general.json
+++ b/Documentation/ObjectInfo/browser_windows8general.json
@@ -1,355 +0,0 @@
 {
    "browser_windows8general":  [
                                    {
                                        "dataType":  0,
                                        "category":  17,
                                        "nameResourceKey":  "blockAutofillName",
                                        "descriptionResourceKey":  "blockAutofillDescription",
                                        "childSettings":  [
                                                          ],
                                        "options":  [
                                                    ],
                                        "entityKey":  "browserBlockAutofill",
                                        "booleanActions":  3,
                                        "defaultValue":  false,
                                        "policyType":  92,
                                        "enabled":  true
                                    },
                                    {
                                        "dataType":  0,
                                        "category":  17,
                                        "nameResourceKey":  "requireFraudWarningName",
                                        "descriptionResourceKey":  "requireFraudWarningDescription",
                                        "childSettings":  [
                                                          ],
                                        "options":  [
                                                    ],
                                        "entityKey":  "browserRequireFraudWarning",
                                        "booleanActions":  1,
                                        "defaultValue":  false,
                                        "policyType":  92,
                                        "enabled":  true
                                    },
                                    {
                                        "dataType":  0,
                                        "category":  17,
                                        "nameResourceKey":  "blockSmartScreenName",
                                        "descriptionResourceKey":  "blockSmartScreenDescription",
                                        "childSettings":  [
                                                          ],
                                        "options":  [
                                                    ],
                                        "entityKey":  "browserRequireSmartScreen",
                                        "booleanActions":  3,
                                        "defaultValue":  false,
                                        "policyType":  92,
                                        "enabled":  true
                                    },
                                    {
                                        "dataType":  0,
                                        "category":  17,
                                        "nameResourceKey":  "blockJavaScriptName",
                                        "descriptionResourceKey":  "blockJavaScriptDescription",
                                        "childSettings":  [
                                                          ],
                                        "options":  [
                                                    ],
                                        "entityKey":  "browserBlockJavaScript",
                                        "booleanActions":  3,
                                        "defaultValue":  false,
                                        "policyType":  92,
                                        "enabled":  true
                                    },
                                    {
                                        "dataType":  0,
                                        "category":  17,
                                        "nameResourceKey":  "blockPopUpsName",
                                        "descriptionResourceKey":  "blockPopUpsDescription",
                                        "childSettings":  [
                                                          ],
                                        "options":  [
                                                    ],
                                        "entityKey":  "browserBlockPopups",
                                        "booleanActions":  3,
                                        "defaultValue":  false,
                                        "policyType":  92,
                                        "enabled":  true
                                    },
                                    {
                                        "dataType":  0,
                                        "category":  17,
                                        "nameResourceKey":  "blockDoNotTrackHeaderName",
                                        "descriptionResourceKey":  "blockDoNotTrackHeaderDescription",
                                        "childSettings":  [
                                                          ],
                                        "options":  [
                                                    ],
                                        "entityKey":  "browserBlockSendingDoNotTrackHeader",
                                        "booleanActions":  3,
                                        "defaultValue":  false,
                                        "policyType":  92,
                                        "enabled":  true
                                    },
                                    {
                                        "dataType":  0,
                                        "category":  17,
                                        "nameResourceKey":  "blockPluginsName",
                                        "descriptionResourceKey":  "blockPluginsDescription",
                                        "childSettings":  [
                                                          ],
                                        "options":  [
                                                    ],
                                        "entityKey":  "browserBlockPlugins",
                                        "booleanActions":  3,
                                        "defaultValue":  false,
                                        "policyType":  92,
                                        "enabled":  true
                                    },
                                    {
                                        "dataType":  0,
                                        "category":  17,
                                        "nameResourceKey":  "blockSingleWordEntryIntranetName",
                                        "descriptionResourceKey":  "blockSingleWordEntryIntranetDescription",
                                        "childSettings":  [
                                                          ],
                                        "options":  [
                                                    ],
                                        "entityKey":  "browserBlockSingleWordEntryOnIntranetSites",
                                        "booleanActions":  3,
                                        "defaultValue":  false,
                                        "policyType":  92,
                                        "enabled":  true
                                    },
                                    {
                                        "dataType":  0,
                                        "category":  17,
                                        "nameResourceKey":  "blockIntranetAutoDetectName",
                                        "descriptionResourceKey":  "blockIntranetAutoDetectDescription",
                                        "childSettings":  [
                                                          ],
                                        "options":  [
                                                    ],
                                        "entityKey":  "browserBlockAutomaticDetectionOfIntranetSites",
                                        "booleanActions":  3,
                                        "defaultValue":  false,
                                        "policyType":  92,
                                        "enabled":  true
                                    },
                                    {
                                        "dataType":  16,
                                        "category":  17,
                                        "nameResourceKey":  "internetSecurityLevelName",
                                        "descriptionResourceKey":  "internetSecurityLevelDescription",
                                        "childSettings":  [
                                                          ],
                                        "options":  [
                                                        {
                                                            "nameResourceKey":  "notConfigured",
                                                            "value":  "userDefined",
                                                            "enabled":  true
                                                        },
                                                        {
                                                            "nameResourceKey":  "highOption",
                                                            "value":  "high",
                                                            "enabled":  true
                                                        },
                                                        {
                                                            "nameResourceKey":  "mediumHighOption",
                                                            "value":  "mediumHigh",
                                                            "enabled":  true
                                                        },
                                                        {
                                                            "nameResourceKey":  "mediumOption",
                                                            "value":  "medium",
                                                            "enabled":  true
                                                        }
                                                    ],
                                        "entityKey":  "browserInternetSecurityLevel",
                                        "booleanActions":  0,
                                        "defaultValue":  "userDefined",
                                        "unconfiguredValue":  "userDefined",
                                        "policyType":  92,
                                        "enabled":  true
                                    },
                                    {
                                        "dataType":  16,
                                        "category":  17,
                                        "nameResourceKey":  "intranetSecurityLevelName",
                                        "descriptionResourceKey":  "intranetSecurityLevelDescription",
                                        "childSettings":  [
                                                          ],
                                        "options":  [
                                                        {
                                                            "nameResourceKey":  "notConfigured",
                                                            "value":  "userDefined",
                                                            "enabled":  true
                                                        },
                                                        {
                                                            "nameResourceKey":  "highOption",
                                                            "value":  "high",
                                                            "enabled":  true
                                                        },
                                                        {
                                                            "nameResourceKey":  "mediumHighOption",
                                                            "value":  "mediumHigh",
                                                            "enabled":  true
                                                        },
                                                        {
                                                            "nameResourceKey":  "mediumOption",
                                                            "value":  "medium",
                                                            "enabled":  true
                                                        },
                                                        {
                                                            "nameResourceKey":  "mediumLowOption",
                                                            "value":  "mediumLow",
                                                            "enabled":  true
                                                        },
                                                        {
                                                            "nameResourceKey":  "lowOption",
                                                            "value":  "low",
                                                            "enabled":  true
                                                        }
                                                    ],
                                        "entityKey":  "browserIntranetSecurityLevel",
                                        "booleanActions":  0,
                                        "defaultValue":  "userDefined",
                                        "unconfiguredValue":  "userDefined",
                                        "policyType":  92,
                                        "enabled":  true
                                    },
                                    {
                                        "dataType":  16,
                                        "category":  17,
                                        "nameResourceKey":  "trustedSitesSecurityLevelName",
                                        "descriptionResourceKey":  "trustedSitesSecurityLevelDescription",
                                        "childSettings":  [
                                                          ],
                                        "options":  [
                                                        {
                                                            "nameResourceKey":  "notConfigured",
                                                            "value":  "userDefined",
                                                            "enabled":  true
                                                        },
                                                        {
                                                            "nameResourceKey":  "highOption",
                                                            "value":  "high",
                                                            "enabled":  true
                                                        },
                                                        {
                                                            "nameResourceKey":  "mediumHighOption",
                                                            "value":  "mediumHigh",
                                                            "enabled":  true
                                                        },
                                                        {
                                                            "nameResourceKey":  "mediumOption",
                                                            "value":  "medium",
                                                            "enabled":  true
                                                        },
                                                        {
                                                            "nameResourceKey":  "mediumLowOption",
                                                            "value":  "mediumLow",
                                                            "enabled":  true
                                                        },
                                                        {
                                                            "nameResourceKey":  "lowOption",
                                                            "value":  "low",
                                                            "enabled":  true
                                                        }
                                                    ],
                                        "entityKey":  "browserTrustedSitesSecurityLevel",
                                        "booleanActions":  0,
                                        "defaultValue":  "userDefined",
                                        "unconfiguredValue":  "userDefined",
                                        "policyType":  92,
                                        "enabled":  true
                                    },
                                    {
                                        "dataType":  0,
                                        "category":  17,
                                        "nameResourceKey":  "restrictedSitesSecurityLevelName",
                                        "descriptionResourceKey":  "restrictedSitesSecurityLevelDescription",
                                        "childSettings":  [
                                                          ],
                                        "options":  [
                                                    ],
                                        "entityKey":  "browserRequireHighSecurityForRestrictedSites",
                                        "booleanActions":  4,
                                        "defaultValue":  false,
                                        "policyType":  92,
                                        "enabled":  true
                                    },
                                    {
                                        "dataType":  0,
                                        "category":  17,
                                        "nameResourceKey":  "enterpriseModeMenuAccessName",
                                        "descriptionResourceKey":  "enterpriseModeMenuAccessDescription",
                                        "childSettings":  [
                                                              {
                                                                  "dataType":  20,
                                                                  "category":  17,
                                                                  "nameResourceKey":  "loggingReportLocationName",
                                                                  "descriptionResourceKey":  "loggingReportLocationDescription",
                                                                  "emptyValueResourceKey":  "enterpriseModeLoggingExample",
                                                                  "childSettings":  [
                                                                                    ],
                                                                  "options":  [
                                                                              ],
                                                                  "entityKey":  "browserLoggingReportLocation",
                                                                  "booleanActions":  0,
                                                                  "policyType":  92,
                                                                  "enabled":  true
                                                              }
                                                          ],
                                        "options":  [
                                                    ],
                                        "entityKey":  "browserBlockEnterpriseModeAccess",
                                        "booleanActions":  3,
                                        "defaultValue":  false,
                                        "policyType":  92,
                                        "enabled":  true
                                    },
                                    {
                                        "dataType":  20,
                                        "category":  17,
                                        "nameResourceKey":  "enterpriseModeSiteListLocationName",
                                        "descriptionResourceKey":  "enterpriseModeSiteListLocationDescription",
                                        "emptyValueResourceKey":  "enterpriseModeSiteListExample",
                                        "childSettings":  [
                                                          ],
                                        "options":  [
                                                    ],
                                        "entityKey":  "browserEnterpriseModeSiteListLocation",
                                        "booleanActions":  0,
                                        "policyType":  92,
                                        "enabled":  true
                                    }
                                ]
 }
--- a/Documentation/ObjectInfo/browser_windowsphonegeneral.json
+++ b/Documentation/ObjectInfo/browser_windowsphonegeneral.json
@@ -1,19 +0,0 @@
 {
    "browser_windowsphonegeneral":  {
                                        "dataType":  0,
                                        "category":  17,
                                        "nameResourceKey":  "blockWebBrowserName",
                                        "descriptionResourceKey":  "blockWebBrowserDescription",
                                        "childSettings":  [
                                                          ],
                                        "options":  [
                                                    ],
                                        "entityKey":  "webBrowserBlocked",
                                        "booleanActions":  3,
                                        "defaultValue":  false,
                                        "policyType":  101,
                                        "enabled":  true
                                    }
 }
--- a/Documentation/ObjectInfo/builtinapps_iosgeneral.json
+++ b/Documentation/ObjectInfo/builtinapps_iosgeneral.json
@@ -1,498 +0,0 @@
 {
    "builtinapps_iosgeneral":  [
                                   {
                                       "isSettingDescription":  false,
                                       "showAsSectionHeader":  true,
                                       "dataType":  8,
                                       "category":  18,
                                       "nameResourceKey":  "allEnrollmentTypesHeaderName",
                                       "descriptionResourceKey":  "allEnrollmentTypesHeaderDescription",
                                       "childSettings":  [
                                                             {
                                                                 "dataType":  0,
                                                                 "category":  18,
                                                                 "nameResourceKey":  "blockSiriName",
                                                                 "childSettings":  [
                                                                                       {
                                                                                           "dataType":  0,
                                                                                           "category":  18,
                                                                                           "nameResourceKey":  "blockSiriWhenLockedName",
                                                                                           "childSettings":  [
                                                                                                             ],
                                                                                           "options":  [
                                                                                                       ],
                                                                                           "entityKey":  "siriBlockedWhenLocked",
                                                                                           "booleanActions":  9,
                                                                                           "defaultValue":  false,
                                                                                           "policyType":  46,
                                                                                           "enabled":  true
                                                                                       }
                                                                                   ],
                                                                 "options":  [
                                                                             ],
                                                                 "entityKey":  "siriBlocked",
                                                                 "booleanActions":  9,
                                                                 "defaultValue":  false,
                                                                 "policyType":  46,
                                                                 "enabled":  true
                                                             },
                                                             {
                                                                 "dataType":  0,
                                                                 "category":  18,
                                                                 "nameResourceKey":  "requireFraudWarningNameIOS",
                                                                 "childSettings":  [
                                                                                   ],
                                                                 "options":  [
                                                                             ],
                                                                 "entityKey":  "safariRequireFraudWarning",
                                                                 "booleanActions":  9,
                                                                 "defaultValue":  false,
                                                                 "policyType":  46,
                                                                 "enabled":  true
                                                             }
                                                         ],
                                       "options":  [
                                                   ],
                                       "booleanActions":  0,
                                       "policyType":  46,
                                       "enabled":  true
                                   },
                                   {
                                       "isSettingDescription":  false,
                                       "showAsSectionHeader":  true,
                                       "dataType":  8,
                                       "category":  18,
                                       "nameResourceKey":  "deviceEnrollmentAndAutomatedDeviceEnrollmentHeaderName",
                                       "descriptionResourceKey":  "deviceEnrollmentAndAutomatedDeviceEnrollmentHeaderDescription",
                                       "childSettings":  [
                                                             {
                                                                 "dataType":  0,
                                                                 "category":  18,
                                                                 "nameResourceKey":  "blockSpotlightInternetResultsName",
                                                                 "descriptionResourceKey":  "blockSpotlightInternetResultsDescription",
                                                                 "childSettings":  [
                                                                                   ],
                                                                 "options":  [
                                                                             ],
                                                                 "entityKey":  "spotlightBlockInternetResults",
                                                                 "booleanActions":  9,
                                                                 "defaultValue":  false,
                                                                 "policyType":  46,
                                                                 "enabled":  true
                                                             },
                                                             {
                                                                 "dataType":  16,
                                                                 "category":  18,
                                                                 "nameResourceKey":  "blockCookiesNameIOS",
                                                                 "descriptionResourceKey":  "blockCookiesDescriptionIOS",
                                                                 "childSettings":  [
                                                                                   ],
                                                                 "options":  [
                                                                                 {
                                                                                     "nameResourceKey":  "notConfigured",
                                                                                     "value":  "browserDefault",
                                                                                     "enabled":  true
                                                                                 },
                                                                                 {
                                                                                     "nameResourceKey":  "webBrowserCookiesAllowAll",
                                                                                     "value":  "allowAlways",
                                                                                     "enabled":  true
                                                                                 },
                                                                                 {
                                                                                     "nameResourceKey":  "webBrowserCookiesPreventAndBlock",
                                                                                     "value":  "blockAlways",
                                                                                     "enabled":  true
                                                                                 },
                                                                                 {
                                                                                     "nameResourceKey":  "webBrowserCookiesPreventCrossSite",
                                                                                     "value":  "allowCurrentWebSite",
                                                                                     "enabled":  true
                                                                                 }
                                                                             ],
                                                                 "entityKey":  "safariCookieSettings",
                                                                 "booleanActions":  0,
                                                                 "defaultValue":  "browserDefault",
                                                                 "unconfiguredValue":  "browserDefault",
                                                                 "policyType":  46,
                                                                 "enabled":  true
                                                             },
                                                             {
                                                                 "dataType":  0,
                                                                 "category":  18,
                                                                 "nameResourceKey":  "blockJavaScriptNameIOS",
                                                                 "childSettings":  [
                                                                                   ],
                                                                 "options":  [
                                                                             ],
                                                                 "entityKey":  "safariBlockJavaScript",
                                                                 "booleanActions":  9,
                                                                 "defaultValue":  false,
                                                                 "policyType":  46,
                                                                 "enabled":  true
                                                             },
                                                             {
                                                                 "dataType":  0,
                                                                 "category":  18,
                                                                 "nameResourceKey":  "blockPopUpsNameIOS",
                                                                 "childSettings":  [
                                                                                   ],
                                                                 "options":  [
                                                                             ],
                                                                 "entityKey":  "safariBlockPopups",
                                                                 "booleanActions":  9,
                                                                 "defaultValue":  false,
                                                                 "policyType":  46,
                                                                 "enabled":  true
                                                             },
                                                             {
                                                                 "dataType":  0,
                                                                 "category":  18,
                                                                 "nameResourceKey":  "onDeviceOnlyDictationForcedName",
                                                                 "descriptionResourceKey":  "onDeviceOnlyDictationForcedDescription",
                                                                 "childSettings":  [
                                                                                   ],
                                                                 "options":  [
                                                                             ],
                                                                 "entityKey":  "onDeviceOnlyDictationForced",
                                                                 "booleanActions":  9,
                                                                 "defaultValue":  false,
                                                                 "policyType":  46,
                                                                 "enabled":  true
                                                             },
                                                             {
                                                                 "dataType":  0,
                                                                 "category":  18,
                                                                 "nameResourceKey":  "onDeviceOnlyTranslationForcedName",
                                                                 "descriptionResourceKey":  "onDeviceOnlyTranslationForcedDescription",
                                                                 "childSettings":  [
                                                                                   ],
                                                                 "options":  [
                                                                             ],
                                                                 "entityKey":  "onDeviceOnlyTranslationForced",
                                                                 "booleanActions":  9,
                                                                 "defaultValue":  false,
                                                                 "policyType":  46,
                                                                 "enabled":  true
                                                             }
                                                         ],
                                       "options":  [
                                                   ],
                                       "booleanActions":  0,
                                       "policyType":  46,
                                       "enabled":  true
                                   },
                                   {
                                       "isSettingDescription":  false,
                                       "showAsSectionHeader":  true,
                                       "dataType":  8,
                                       "category":  18,
                                       "nameResourceKey":  "automatedDeviceEnrollmentHeaderName",
                                       "descriptionResourceKey":  "automatedDeviceEnrollmentHeaderDescription",
                                       "childSettings":  [
                                                             {
                                                                 "dataType":  0,
                                                                 "category":  18,
                                                                 "nameResourceKey":  "blockIosCameraName",
                                                                 "childSettings":  [
                                                                                       {
                                                                                           "dataType":  0,
                                                                                           "category":  18,
                                                                                           "nameResourceKey":  "blockFacetimeName",
                                                                                           "childSettings":  [
                                                                                                             ],
                                                                                           "options":  [
                                                                                                       ],
                                                                                           "entityKey":  "faceTimeBlocked",
                                                                                           "booleanActions":  9,
                                                                                           "defaultValue":  false,
                                                                                           "policyType":  46,
                                                                                           "enabled":  true
                                                                                       }
                                                                                   ],
                                                                 "options":  [
                                                                             ],
                                                                 "entityKey":  "cameraBlocked",
                                                                 "booleanActions":  9,
                                                                 "defaultValue":  false,
                                                                 "policyType":  46,
                                                                 "enabled":  true
                                                             },
                                                             {
                                                                 "dataType":  0,
                                                                 "category":  18,
                                                                 "nameResourceKey":  "requireSiriProfanityFilterName",
                                                                 "descriptionResourceKey":  "requireSiriProfanityFilterDescription",
                                                                 "childSettings":  [
                                                                                   ],
                                                                 "options":  [
                                                                             ],
                                                                 "entityKey":  "siriRequireProfanityFilter",
                                                                 "booleanActions":  9,
                                                                 "defaultValue":  false,
                                                                 "policyType":  46,
                                                                 "enabled":  true
                                                             },
                                                             {
                                                                 "dataType":  0,
                                                                 "category":  18,
                                                                 "nameResourceKey":  "blockSiriUserGeneratedContentName",
                                                                 "descriptionResourceKey":  "blockSiriUserGeneratedContentDescription",
                                                                 "childSettings":  [
                                                                                   ],
                                                                 "options":  [
                                                                             ],
                                                                 "entityKey":  "siriBlockUserGeneratedContent",
                                                                 "booleanActions":  9,
                                                                 "defaultValue":  false,
                                                                 "policyType":  46,
                                                                 "enabled":  true
                                                             },
                                                             {
                                                                 "dataType":  0,
                                                                 "category":  18,
                                                                 "nameResourceKey":  "blockAppleNewsName",
                                                                 "childSettings":  [
                                                                                   ],
                                                                 "options":  [
                                                                             ],
                                                                 "entityKey":  "appleNewsBlocked",
                                                                 "booleanActions":  9,
                                                                 "defaultValue":  false,
                                                                 "policyType":  46,
                                                                 "enabled":  true
                                                             },
                                                             {
                                                                 "dataType":  0,
                                                                 "category":  18,
                                                                 "nameResourceKey":  "blockIBooksStoreName",
                                                                 "childSettings":  [
                                                                                   ],
                                                                 "options":  [
                                                                             ],
                                                                 "entityKey":  "iBooksStoreBlocked",
                                                                 "booleanActions":  9,
                                                                 "defaultValue":  false,
                                                                 "policyType":  46,
                                                                 "enabled":  true
                                                             },
                                                             {
                                                                 "dataType":  0,
                                                                 "category":  18,
                                                                 "nameResourceKey":  "blockMessagesName",
                                                                 "childSettings":  [
                                                                                   ],
                                                                 "options":  [
                                                                             ],
                                                                 "entityKey":  "messagesBlocked",
                                                                 "booleanActions":  9,
                                                                 "defaultValue":  false,
                                                                 "policyType":  46,
                                                                 "enabled":  true
                                                             },
                                                             {
                                                                 "dataType":  0,
                                                                 "category":  18,
                                                                 "nameResourceKey":  "blockPodcastsName",
                                                                 "childSettings":  [
                                                                                   ],
                                                                 "options":  [
                                                                             ],
                                                                 "entityKey":  "podcastsBlocked",
                                                                 "booleanActions":  9,
                                                                 "defaultValue":  false,
                                                                 "policyType":  46,
                                                                 "enabled":  true
                                                             },
                                                             {
                                                                 "dataType":  0,
                                                                 "category":  18,
                                                                 "nameResourceKey":  "blockITunesMusicServiceName",
                                                                 "descriptionResourceKey":  "blockITunesMusicServiceDescription",
                                                                 "childSettings":  [
                                                                                   ],
                                                                 "options":  [
                                                                             ],
                                                                 "entityKey":  "iTunesBlockMusicService",
                                                                 "booleanActions":  9,
                                                                 "defaultValue":  false,
                                                                 "policyType":  46,
                                                                 "enabled":  true
                                                             },
                                                             {
                                                                 "dataType":  0,
                                                                 "category":  18,
                                                                 "nameResourceKey":  "blockITunesRadioName",
                                                                 "childSettings":  [
                                                                                   ],
                                                                 "options":  [
                                                                             ],
                                                                 "entityKey":  "iTunesBlockRadio",
                                                                 "booleanActions":  9,
                                                                 "defaultValue":  false,
                                                                 "policyType":  46,
                                                                 "enabled":  true
                                                             },
                                                             {
                                                                 "dataType":  0,
                                                                 "category":  18,
                                                                 "nameResourceKey":  "blockITunesStoreName",
                                                                 "childSettings":  [
                                                                                   ],
                                                                 "options":  [
                                                                             ],
                                                                 "entityKey":  "iTunesBlocked",
                                                                 "booleanActions":  9,
                                                                 "defaultValue":  false,
                                                                 "policyType":  46,
                                                                 "enabled":  true
                                                             },
                                                             {
                                                                 "dataType":  0,
                                                                 "category":  18,
                                                                 "nameResourceKey":  "blockFindMyDeviceName",
                                                                 "descriptionResourceKey":  "blockFindMyDeviceDescription",
                                                                 "childSettings":  [
                                                                                   ],
                                                                 "options":  [
                                                                             ],
                                                                 "entityKey":  "findMyDeviceInFindMyAppBlocked",
                                                                 "booleanActions":  9,
                                                                 "defaultValue":  false,
                                                                 "policyType":  46,
                                                                 "enabled":  true
                                                             },
                                                             {
                                                                 "dataType":  0,
                                                                 "category":  18,
                                                                 "nameResourceKey":  "blockFindMyFriendsName",
                                                                 "descriptionResourceKey":  "blockFindMyFriendsDescription",
                                                                 "childSettings":  [
                                                                                   ],
                                                                 "options":  [
                                                                             ],
                                                                 "entityKey":  "findMyFriendsInFindMyAppBlocked",
                                                                 "booleanActions":  9,
                                                                 "defaultValue":  false,
                                                                 "policyType":  46,
                                                                 "enabled":  true
                                                             },
                                                             {
                                                                 "dataType":  0,
                                                                 "category":  18,
                                                                 "nameResourceKey":  "blockFindMyFriendsModificationName",
                                                                 "descriptionResourceKey":  "blockFindMyFriendsModificationDescription",
                                                                 "childSettings":  [
                                                                                   ],
                                                                 "options":  [
                                                                             ],
                                                                 "entityKey":  "findMyFriendsBlocked",
                                                                 "booleanActions":  9,
                                                                 "defaultValue":  false,
                                                                 "policyType":  46,
                                                                 "enabled":  true
                                                             },
                                                             {
                                                                 "dataType":  0,
                                                                 "category":  18,
                                                                 "nameResourceKey":  "blockSystemAppRemovalName",
                                                                 "descriptionResourceKey":  "blockSystemAppRemovalDescription",
                                                                 "childSettings":  [
                                                                                   ],
                                                                 "options":  [
                                                                             ],
                                                                 "entityKey":  "blockSystemAppRemoval",
                                                                 "booleanActions":  9,
                                                                 "defaultValue":  false,
                                                                 "policyType":  46,
                                                                 "enabled":  true
                                                             },
                                                             {
                                                                 "dataType":  0,
                                                                 "category":  18,
                                                                 "nameResourceKey":  "blockSafariName",
                                                                 "descriptionResourceKey":  "blockSafariDescription",
                                                                 "childSettings":  [
                                                                                   ],
                                                                 "options":  [
                                                                             ],
                                                                 "entityKey":  "safariBlocked",
                                                                 "booleanActions":  9,
                                                                 "defaultValue":  false,
                                                                 "policyType":  46,
                                                                 "enabled":  true
                                                             },
                                                             {
                                                                 "dataType":  0,
                                                                 "category":  18,
                                                                 "nameResourceKey":  "blockIosSafariAutofillName",
                                                                 "childSettings":  [
                                                                                   ],
                                                                 "options":  [
                                                                             ],
                                                                 "entityKey":  "safariBlockAutofill",
                                                                 "booleanActions":  9,
                                                                 "defaultValue":  false,
                                                                 "policyType":  46,
                                                                 "enabled":  true
                                                             }
                                                         ],
                                       "options":  [
                                                   ],
                                       "booleanActions":  0,
                                       "policyType":  46,
                                       "enabled":  true
                                   }
                               ]
 }
--- a/Documentation/ObjectInfo/builtinapps_macgeneral.json
+++ b/Documentation/ObjectInfo/builtinapps_macgeneral.json
@@ -1,102 +0,0 @@
 {
    "builtinapps_macgeneral":  {
                                   "isSettingDescription":  false,
                                   "showAsSectionHeader":  true,
                                   "dataType":  8,
                                   "category":  18,
                                   "nameResourceKey":  "allEnrollmentTypesHeaderNameMac",
                                   "descriptionResourceKey":  "allEnrollmentTypesHeaderDescriptionMac",
                                   "childSettings":  [
                                                         {
                                                             "dataType":  0,
                                                             "category":  18,
                                                             "nameResourceKey":  "blockSafariAutofillName",
                                                             "descriptionResourceKey":  "blockSafariAutofillDescription",
                                                             "childSettings":  [
                                                                               ],
                                                             "options":  [
                                                                         ],
                                                             "entityKey":  "safariBlockAutofill",
                                                             "booleanActions":  9,
                                                             "defaultValue":  false,
                                                             "policyType":  61,
                                                             "enabled":  true
                                                         },
                                                         {
                                                             "dataType":  0,
                                                             "category":  18,
                                                             "nameResourceKey":  "blockCameraNameMacOS",
                                                             "descriptionResourceKey":  "blockCameraDescriptionMacOS",
                                                             "childSettings":  [
                                                                               ],
                                                             "options":  [
                                                                         ],
                                                             "entityKey":  "cameraBlocked",
                                                             "booleanActions":  9,
                                                             "defaultValue":  false,
                                                             "policyType":  61,
                                                             "enabled":  true
                                                         },
                                                         {
                                                             "dataType":  0,
                                                             "category":  18,
                                                             "nameResourceKey":  "blockITunesMusicServiceNameMacOS",
                                                             "childSettings":  [
                                                                               ],
                                                             "options":  [
                                                                         ],
                                                             "entityKey":  "iTunesBlockMusicService",
                                                             "booleanActions":  9,
                                                             "defaultValue":  false,
                                                             "policyType":  61,
                                                             "enabled":  true
                                                         },
                                                         {
                                                             "dataType":  0,
                                                             "category":  18,
                                                             "nameResourceKey":  "blockSpotlightInternetResultsNameMacOS",
                                                             "descriptionResourceKey":  "blockSpotlightInternetResultsDescription",
                                                             "childSettings":  [
                                                                               ],
                                                             "options":  [
                                                                         ],
                                                             "entityKey":  "spotlightBlockInternetResults",
                                                             "booleanActions":  9,
                                                             "defaultValue":  false,
                                                             "policyType":  61,
                                                             "enabled":  true
                                                         },
                                                         {
                                                             "dataType":  0,
                                                             "category":  18,
                                                             "nameResourceKey":  "blockITunesFileSharingName",
                                                             "descriptionResourceKey":  "blockITunesFileSharingDescription",
                                                             "childSettings":  [
                                                                               ],
                                                             "options":  [
                                                                         ],
                                                             "entityKey":  "iTunesBlockFileSharing",
                                                             "booleanActions":  9,
                                                             "defaultValue":  false,
                                                             "policyType":  61,
                                                             "enabled":  true
                                                         }
                                                     ],
                                   "options":  [
                                               ],
                                   "booleanActions":  0,
                                   "policyType":  61,
                                   "enabled":  true
                               }
 }
--- a/Documentation/ObjectInfo/cameras_windows10devicefirmwareconfigurationinterface.json
+++ b/Documentation/ObjectInfo/cameras_windows10devicefirmwareconfigurationinterface.json
@@ -1,146 +0,0 @@
 {
    "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
                                                                  }
                                                              ]
 }
--- a/Documentation/ObjectInfo/cellular_windows8general.json
+++ b/Documentation/ObjectInfo/cellular_windows8general.json
@@ -1,19 +0,0 @@
 {
    "cellular_windows8general":  {
                                     "dataType":  0,
                                     "category":  20,
                                     "nameResourceKey":  "blockDataRoamingName",
                                     "descriptionResourceKey":  "blockDataRoamingDescription",
                                     "childSettings":  [
                                                       ],
                                     "options":  [
                                                 ],
                                     "entityKey":  "cellularBlockDataRoaming",
                                     "booleanActions":  3,
                                     "defaultValue":  false,
                                     "policyType":  92,
                                     "enabled":  true
                                 }
 }
--- a/Documentation/ObjectInfo/cloudandstorage_androidgeneral.json
+++ b/Documentation/ObjectInfo/cloudandstorage_androidgeneral.json
@@ -1,72 +0,0 @@
 {
    "cloudandstorage_androidgeneral":  [
                                           {
                                               "dataType":  0,
                                               "category":  21,
                                               "nameResourceKey":  "blockGoogleBackupName",
                                               "descriptionResourceKey":  "blockGoogleBackupDescription",
                                               "childSettings":  [
                                                                 ],
                                               "options":  [
                                                           ],
                                               "entityKey":  "storageBlockGoogleBackup",
                                               "booleanActions":  3,
                                               "defaultValue":  false,
                                               "policyType":  20,
                                               "enabled":  true
                                           },
                                           {
                                               "dataType":  0,
                                               "category":  21,
                                               "nameResourceKey":  "blockGoogleAccountAutoSyncName",
                                               "descriptionResourceKey":  "blockGoogleAccountAutoSyncDescription",
                                               "childSettings":  [
                                                                 ],
                                               "options":  [
                                                           ],
                                               "entityKey":  "googleAccountBlockAutoSync",
                                               "booleanActions":  3,
                                               "defaultValue":  false,
                                               "policyType":  20,
                                               "enabled":  true
                                           },
                                           {
                                               "dataType":  0,
                                               "category":  21,
                                               "nameResourceKey":  "knoxBlockRemovableStorageName",
                                               "descriptionResourceKey":  "BlockRemovableStorageAndroidDescription",
                                               "childSettings":  [
                                                                 ],
                                               "options":  [
                                                           ],
                                               "entityKey":  "storageBlockRemovableStorage",
                                               "booleanActions":  3,
                                               "defaultValue":  false,
                                               "policyType":  20,
                                               "enabled":  true
                                           },
                                           {
                                               "dataType":  0,
                                               "category":  21,
                                               "nameResourceKey":  "knoxRequireEncryptionOnRemovableStorageName",
                                               "descriptionResourceKey":  "knoxRequireEncryptionOnRemovableStorageDescription",
                                               "childSettings":  [
                                                                 ],
                                               "options":  [
                                                           ],
                                               "entityKey":  "storageRequireRemovableStorageEncryption",
                                               "booleanActions":  1,
                                               "defaultValue":  false,
                                               "policyType":  20,
                                               "enabled":  true
                                           }
                                       ]
 }
--- a/Documentation/ObjectInfo/cloudandstorage_iosgeneral.json
+++ b/Documentation/ObjectInfo/cloudandstorage_iosgeneral.json
@@ -1,254 +0,0 @@
 {
    "cloudandstorage_iosgeneral":  [
                                       {
                                           "isSettingDescription":  false,
                                           "showAsSectionHeader":  true,
                                           "dataType":  8,
                                           "category":  21,
                                           "nameResourceKey":  "allEnrollmentTypesHeaderName",
                                           "descriptionResourceKey":  "allEnrollmentTypesHeaderDescription",
                                           "childSettings":  [
                                                                 {
                                                                     "dataType":  0,
                                                                     "category":  21,
                                                                     "nameResourceKey":  "requireEncryptedBackupName",
                                                                     "descriptionResourceKey":  "requireEncryptedBackupDescription",
                                                                     "childSettings":  [
                                                                                       ],
                                                                     "options":  [
                                                                                 ],
                                                                     "entityKey":  "iCloudRequireEncryptedBackup",
                                                                     "booleanActions":  9,
                                                                     "defaultValue":  false,
                                                                     "policyType":  46,
                                                                     "enabled":  true
                                                                 },
                                                                 {
                                                                     "dataType":  0,
                                                                     "category":  21,
                                                                     "nameResourceKey":  "blockManagedAppsCloudSyncName",
                                                                     "descriptionResourceKey":  "blockManagedAppsCloudSyncDescription",
                                                                     "childSettings":  [
                                                                                       ],
                                                                     "options":  [
                                                                                 ],
                                                                     "entityKey":  "iCloudBlockManagedAppsSync",
                                                                     "booleanActions":  9,
                                                                     "defaultValue":  false,
                                                                     "policyType":  46,
                                                                     "enabled":  true
                                                                 },
                                                                 {
                                                                     "dataType":  0,
                                                                     "category":  21,
                                                                     "nameResourceKey":  "blockEnterpriseBookBackupName",
                                                                     "childSettings":  [
                                                                                       ],
                                                                     "options":  [
                                                                                 ],
                                                                     "entityKey":  "enterpriseBookBlockBackup",
                                                                     "booleanActions":  9,
                                                                     "defaultValue":  false,
                                                                     "policyType":  46,
                                                                     "enabled":  true
                                                                 },
                                                                 {
                                                                     "dataType":  0,
                                                                     "category":  21,
                                                                     "nameResourceKey":  "blockEnterpriseBookMetadataSyncName",
                                                                     "childSettings":  [
                                                                                       ],
                                                                     "options":  [
                                                                                 ],
                                                                     "entityKey":  "enterpriseBookBlockMetadataSync",
                                                                     "booleanActions":  9,
                                                                     "defaultValue":  false,
                                                                     "policyType":  46,
                                                                     "enabled":  true
                                                                 }
                                                             ],
                                           "options":  [
                                                       ],
                                           "booleanActions":  0,
                                           "policyType":  46,
                                           "enabled":  true
                                       },
                                       {
                                           "isSettingDescription":  false,
                                           "showAsSectionHeader":  true,
                                           "dataType":  8,
                                           "category":  21,
                                           "nameResourceKey":  "deviceEnrollmentAndAutomatedDeviceEnrollmentHeaderName",
                                           "descriptionResourceKey":  "deviceEnrollmentAndAutomatedDeviceEnrollmentHeaderDescription",
                                           "childSettings":  [
                                                                 {
                                                                     "dataType":  0,
                                                                     "category":  21,
                                                                     "nameResourceKey":  "blockICloudPhotoStreamSyncName",
                                                                     "descriptionResourceKey":  "blockICloudPhotoStreamSyncDescription",
                                                                     "childSettings":  [
                                                                                       ],
                                                                     "options":  [
                                                                                 ],
                                                                     "entityKey":  "iCloudBlockPhotoStreamSync",
                                                                     "booleanActions":  9,
                                                                     "defaultValue":  false,
                                                                     "policyType":  46,
                                                                     "enabled":  true
                                                                 },
                                                                 {
                                                                     "dataType":  0,
                                                                     "category":  21,
                                                                     "nameResourceKey":  "blockICloudPhotoLibraryName",
                                                                     "descriptionResourceKey":  "blockICloudPhotoLibraryDescription",
                                                                     "childSettings":  [
                                                                                       ],
                                                                     "options":  [
                                                                                 ],
                                                                     "entityKey":  "iCloudBlockPhotoLibrary",
                                                                     "booleanActions":  9,
                                                                     "defaultValue":  false,
                                                                     "policyType":  46,
                                                                     "enabled":  true
                                                                 },
                                                                 {
                                                                     "dataType":  0,
                                                                     "category":  21,
                                                                     "nameResourceKey":  "blockSharedPhotoStreamName",
                                                                     "descriptionResourceKey":  "blockSharedPhotoStreamDescription",
                                                                     "childSettings":  [
                                                                                       ],
                                                                     "options":  [
                                                                                 ],
                                                                     "entityKey":  "iCloudBlockSharedPhotoStream",
                                                                     "booleanActions":  9,
                                                                     "defaultValue":  false,
                                                                     "policyType":  46,
                                                                     "enabled":  true
                                                                 },
                                                                 {
                                                                     "dataType":  0,
                                                                     "category":  21,
                                                                     "nameResourceKey":  "blockIosActivityContinuationName",
                                                                     "descriptionResourceKey":  "blockIosActivityContinuationDescription",
                                                                     "childSettings":  [
                                                                                       ],
                                                                     "options":  [
                                                                                 ],
                                                                     "entityKey":  "iCloudBlockActivityContinuation",
                                                                     "booleanActions":  9,
                                                                     "defaultValue":  false,
                                                                     "policyType":  46,
                                                                     "enabled":  true
                                                                 }
                                                             ],
                                           "options":  [
                                                       ],
                                           "booleanActions":  0,
                                           "policyType":  46,
                                           "enabled":  true
                                       },
                                       {
                                           "isSettingDescription":  false,
                                           "showAsSectionHeader":  true,
                                           "dataType":  8,
                                           "category":  21,
                                           "nameResourceKey":  "automatedDeviceEnrollmentHeaderName",
                                           "descriptionResourceKey":  "automatedDeviceEnrollmentHeaderDescription",
                                           "childSettings":  [
                                                                 {
                                                                     "dataType":  0,
                                                                     "category":  21,
                                                                     "nameResourceKey":  "blockICloudBackupName",
                                                                     "descriptionResourceKey":  "blockICloudBackupDescription",
                                                                     "childSettings":  [
                                                                                       ],
                                                                     "options":  [
                                                                                 ],
                                                                     "entityKey":  "iCloudBlockBackup",
                                                                     "booleanActions":  9,
                                                                     "defaultValue":  false,
                                                                     "policyType":  46,
                                                                     "enabled":  true
                                                                 },
                                                                 {
                                                                     "dataType":  0,
                                                                     "category":  21,
                                                                     "nameResourceKey":  "blockIosICloudDocumentSyncName",
                                                                     "descriptionResourceKey":  "blockIosICloudDocumentSyncDescription",
                                                                     "childSettings":  [
                                                                                       ],
                                                                     "options":  [
                                                                                 ],
                                                                     "entityKey":  "iCloudBlockDocumentSync",
                                                                     "booleanActions":  9,
                                                                     "defaultValue":  false,
                                                                     "policyType":  46,
                                                                     "enabled":  true
                                                                 },
                                                                 {
                                                                     "dataType":  0,
                                                                     "category":  21,
                                                                     "nameResourceKey":  "blockIosKeychainCloudSyncName",
                                                                     "descriptionResourceKey":  "blockIosKeychainCloudSyncDescription",
                                                                     "childSettings":  [
                                                                                       ],
                                                                     "options":  [
                                                                                 ],
                                                                     "entityKey":  "keychainBlockCloudSync",
                                                                     "booleanActions":  9,
                                                                     "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":  [
                                                       ],
                                           "booleanActions":  0,
                                           "policyType":  46,
                                           "enabled":  true
                                       }
                                   ]
 }
--- a/Documentation/ObjectInfo/cloudandstorage_macgeneral.json
+++ b/Documentation/ObjectInfo/cloudandstorage_macgeneral.json
@@ -1,240 +0,0 @@
 {
    "cloudandstorage_macgeneral":  [
                                       {
                                           "isSettingDescription":  false,
                                           "showAsSectionHeader":  true,
                                           "dataType":  8,
                                           "category":  21,
                                           "nameResourceKey":  "allEnrollmentTypesHeaderNameMac",
                                           "descriptionResourceKey":  "allEnrollmentTypesHeaderDescriptionMac",
                                           "childSettings":  [
                                                                 {
                                                                     "dataType":  0,
                                                                     "category":  21,
                                                                     "nameResourceKey":  "blockKeychainCloudSyncName",
                                                                     "descriptionResourceKey":  "blockKeychainCloudSyncDescription",
                                                                     "childSettings":  [
                                                                                       ],
                                                                     "options":  [
                                                                                 ],
                                                                     "entityKey":  "keychainBlockCloudSync",
                                                                     "booleanActions":  9,
                                                                     "defaultValue":  false,
                                                                     "policyType":  61,
                                                                     "enabled":  true
                                                                 },
                                                                 {
                                                                     "dataType":  0,
                                                                     "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":  [
                                                                                       ],
                                                                     "options":  [
                                                                                 ],
                                                                     "entityKey":  "iCloudBlockDocumentSync",
                                                                     "booleanActions":  9,
                                                                     "defaultValue":  false,
                                                                     "policyType":  61,
                                                                     "enabled":  true
                                                                 },
                                                                 {
                                                                     "dataType":  0,
                                                                     "category":  21,
                                                                     "nameResourceKey":  "blockICloudMailName",
                                                                     "descriptionResourceKey":  "blockICloudMailDescription",
                                                                     "childSettings":  [
                                                                                       ],
                                                                     "options":  [
                                                                                 ],
                                                                     "entityKey":  "iCloudBlockMail",
                                                                     "booleanActions":  9,
                                                                     "defaultValue":  false,
                                                                     "policyType":  61,
                                                                     "enabled":  true
                                                                 },
                                                                 {
                                                                     "dataType":  0,
                                                                     "category":  21,
                                                                     "nameResourceKey":  "blockICloudAddressBookName",
                                                                     "descriptionResourceKey":  "blockICloudAddressBookDescription",
                                                                     "childSettings":  [
                                                                                       ],
                                                                     "options":  [
                                                                                 ],
                                                                     "entityKey":  "iCloudBlockAddressBook",
                                                                     "booleanActions":  9,
                                                                     "defaultValue":  false,
                                                                     "policyType":  61,
                                                                     "enabled":  true
                                                                 },
                                                                 {
                                                                     "dataType":  0,
                                                                     "category":  21,
                                                                     "nameResourceKey":  "blockICloudCalendarName",
                                                                     "descriptionResourceKey":  "blockICloudCalendarDescription",
                                                                     "childSettings":  [
                                                                                       ],
                                                                     "options":  [
                                                                                 ],
                                                                     "entityKey":  "iCloudBlockCalendar",
                                                                     "booleanActions":  9,
                                                                     "defaultValue":  false,
                                                                     "policyType":  61,
                                                                     "enabled":  true
                                                                 },
                                                                 {
                                                                     "dataType":  0,
                                                                     "category":  21,
                                                                     "nameResourceKey":  "blockICloudRemindersName",
                                                                     "descriptionResourceKey":  "blockICloudRemindersDescription",
                                                                     "childSettings":  [
                                                                                       ],
                                                                     "options":  [
                                                                                 ],
                                                                     "entityKey":  "iCloudBlockReminders",
                                                                     "booleanActions":  9,
                                                                     "defaultValue":  false,
                                                                     "policyType":  61,
                                                                     "enabled":  true
                                                                 },
                                                                 {
                                                                     "dataType":  0,
                                                                     "category":  21,
                                                                     "nameResourceKey":  "blockICloudBookmarksName",
                                                                     "descriptionResourceKey":  "blockICloudBookmarksDescription",
                                                                     "childSettings":  [
                                                                                       ],
                                                                     "options":  [
                                                                                 ],
                                                                     "entityKey":  "iCloudBlockBookmarks",
                                                                     "booleanActions":  9,
                                                                     "defaultValue":  false,
                                                                     "policyType":  61,
                                                                     "enabled":  true
                                                                 },
                                                                 {
                                                                     "dataType":  0,
                                                                     "category":  21,
                                                                     "nameResourceKey":  "blockICloudNotesName",
                                                                     "descriptionResourceKey":  "blockICloudNotesDescription",
                                                                     "childSettings":  [
                                                                                       ],
                                                                     "options":  [
                                                                                 ],
                                                                     "entityKey":  "iCloudBlockNotes",
                                                                     "booleanActions":  9,
                                                                     "defaultValue":  false,
                                                                     "policyType":  61,
                                                                     "enabled":  true
                                                                 },
                                                                 {
                                                                     "dataType":  0,
                                                                     "category":  21,
                                                                     "nameResourceKey":  "MacBlockICloudPhotoLibraryName",
                                                                     "descriptionResourceKey":  "blockICloudPhotoLibraryDescription",
                                                                     "childSettings":  [
                                                                                       ],
                                                                     "options":  [
                                                                                 ],
                                                                     "entityKey":  "iCloudBlockPhotoLibrary",
                                                                     "booleanActions":  9,
                                                                     "defaultValue":  false,
                                                                     "policyType":  61,
                                                                     "enabled":  true
                                                                 },
                                                                 {
                                                                     "dataType":  0,
                                                                     "category":  21,
                                                                     "nameResourceKey":  "blockMacActivityContinuationName",
                                                                     "descriptionResourceKey":  "blockMacActivityContinuationDescription",
                                                                     "childSettings":  [
                                                                                       ],
                                                                     "options":  [
                                                                                 ],
                                                                     "entityKey":  "iCloudBlockActivityContinuation",
                                                                     "booleanActions":  9,
                                                                     "defaultValue":  false,
                                                                     "policyType":  61,
                                                                     "enabled":  true
                                                                 }
                                                             ],
                                           "options":  [
                                                       ],
                                           "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
                                       }
                                   ]
 }
--- a/Documentation/ObjectInfo/cloudandstorage_windows10general.json
+++ b/Documentation/ObjectInfo/cloudandstorage_windows10general.json
@@ -1,82 +0,0 @@
 {
    "cloudandstorage_windows10general":  [
                                             {
                                                 "dataType":  0,
                                                 "category":  21,
                                                 "nameResourceKey":  "blockMicrosoftAccountName",
                                                 "descriptionResourceKey":  "blockMicrosoftAccountDescription",
                                                 "childSettings":  [
                                                                   ],
                                                 "options":  [
                                                             ],
                                                 "entityKey":  "microsoftAccountBlocked",
                                                 "booleanActions":  3,
                                                 "defaultValue":  false,
                                                 "policyType":  79,
                                                 "enabled":  true
                                             },
                                             {
                                                 "dataType":  0,
                                                 "category":  21,
                                                 "nameResourceKey":  "blockNonMicrosoftAccountName",
                                                 "descriptionResourceKey":  "blockNonMicrosoftAccountDescription",
                                                 "childSettings":  [
                                                                   ],
                                                 "options":  [
                                                             ],
                                                 "entityKey":  "accountsBlockAddingNonMicrosoftAccountEmail",
                                                 "booleanActions":  3,
                                                 "defaultValue":  false,
                                                 "policyType":  79,
                                                 "enabled":  true
                                             },
                                             {
                                                 "dataType":  0,
                                                 "category":  21,
                                                 "nameResourceKey":  "blockSettingsSynchronizationForMicrosoftAccountName",
                                                 "descriptionResourceKey":  "blockSettingsSynchronizationForMicrosoftAccountDescription",
                                                 "childSettings":  [
                                                                   ],
                                                 "options":  [
                                                             ],
                                                 "entityKey":  "microsoftAccountBlockSettingsSync",
                                                 "booleanActions":  3,
                                                 "defaultValue":  false,
                                                 "policyType":  79,
                                                 "enabled":  true
                                             },
                                             {
                                                 "dataType":  16,
                                                 "category":  21,
                                                 "nameResourceKey":  "AccountsSignInAssistantSettingsName",
                                                 "descriptionResourceKey":  "AccountsSignInAssistantSettingsDescription",
                                                 "childSettings":  [
                                                                   ],
                                                 "options":  [
                                                                 {
                                                                     "nameResourceKey":  "NotConfigured",
                                                                     "value":  "notConfigured",
                                                                     "enabled":  true
                                                                 },
                                                                 {
                                                                     "nameResourceKey":  "disableOption",
                                                                     "value":  "disabled",
                                                                     "enabled":  true
                                                                 }
                                                             ],
                                                 "entityKey":  "microsoftAccountSignInAssistantSettings",
                                                 "booleanActions":  0,
                                                 "defaultValue":  "notConfigured",
                                                 "unconfiguredValue":  "notConfigured",
                                                 "policyType":  79,
                                                 "enabled":  true
                                             }
                                         ]
 }
--- a/Documentation/ObjectInfo/cloudandstorage_windows8general.json
+++ b/Documentation/ObjectInfo/cloudandstorage_windows8general.json
@@ -1,37 +0,0 @@
 {
    "cloudandstorage_windows8general":  [
                                            {
                                                "dataType":  20,
                                                "category":  21,
                                                "nameResourceKey":  "workFoldersURLName",
                                                "descriptionResourceKey":  "workFoldersURLDescription",
                                                "childSettings":  [
                                                                  ],
                                                "options":  [
                                                            ],
                                                "entityKey":  "workFoldersUrl",
                                                "booleanActions":  0,
                                                "policyType":  92,
                                                "enabled":  true
                                            },
                                            {
                                                "dataType":  0,
                                                "category":  21,
                                                "nameResourceKey":  "microsoftAccountOptionalForMailName",
                                                "descriptionResourceKey":  "microsoftAccountOptionalForMailDescription",
                                                "childSettings":  [
                                                                  ],
                                                "options":  [
                                                            ],
                                                "entityKey":  "accountsBlockAddingNonMicrosoftAccountEmail",
                                                "booleanActions":  3,
                                                "defaultValue":  false,
                                                "policyType":  92,
                                                "enabled":  true
                                            }
                                        ]
 }
--- a/Documentation/ObjectInfo/cloudprint_windows10general.json
+++ b/Documentation/ObjectInfo/cloudprint_windows10general.json
@@ -1,116 +0,0 @@
 {
    "cloudprint_windows10general":  [
                                        {
                                            "dataType":  20,
                                            "category":  22,
                                            "nameResourceKey":  "cloudPrintDiscoveryEndPointName",
                                            "descriptionResourceKey":  "cloudPrintDiscoveryEndPointDescription",
                                            "emptyValueResourceKey":  "cloudPrintDiscoveryEndPointExample",
                                            "childSettings":  [
                                                              ],
                                            "options":  [
                                                        ],
                                            "entityKey":  "enterpriseCloudPrintDiscoveryEndPoint",
                                            "booleanActions":  0,
                                            "defaultValue":  "",
                                            "unconfiguredValue":  "",
                                            "policyType":  79,
                                            "enabled":  true
                                        },
                                        {
                                            "dataType":  20,
                                            "category":  22,
                                            "nameResourceKey":  "cloudPrintOAuthAuthorityName",
                                            "descriptionResourceKey":  "cloudPrintOAuthAuthorityDescription",
                                            "emptyValueResourceKey":  "cloudPrintOAuthAuthorityExample",
                                            "childSettings":  [
                                                              ],
                                            "options":  [
                                                        ],
                                            "entityKey":  "enterpriseCloudPrintOAuthAuthority",
                                            "booleanActions":  0,
                                            "defaultValue":  "",
                                            "unconfiguredValue":  "",
                                            "policyType":  79,
                                            "enabled":  true
                                        },
                                        {
                                            "dataType":  20,
                                            "category":  22,
                                            "nameResourceKey":  "cloudPrintOAuthClientIdName",
                                            "descriptionResourceKey":  "cloudPrintOAuthClientIdDescription",
                                            "emptyValueResourceKey":  "cloudPrintOAuthClientIdExample",
                                            "childSettings":  [
                                                              ],
                                            "options":  [
                                                        ],
                                            "entityKey":  "enterpriseCloudPrintOAuthClientIdentifier",
                                            "booleanActions":  0,
                                            "defaultValue":  "",
                                            "unconfiguredValue":  "",
                                            "policyType":  79,
                                            "enabled":  true
                                        },
                                        {
                                            "dataType":  20,
                                            "category":  22,
                                            "nameResourceKey":  "cloudPrintResourceIdName",
                                            "descriptionResourceKey":  "cloudPrintResourceIdDescription",
                                            "emptyValueResourceKey":  "cloudPrintResourceIdExample",
                                            "childSettings":  [
                                                              ],
                                            "options":  [
                                                        ],
                                            "entityKey":  "enterpriseCloudPrintResourceIdentifier",
                                            "booleanActions":  0,
                                            "defaultValue":  "",
                                            "unconfiguredValue":  "",
                                            "policyType":  79,
                                            "enabled":  true
                                        },
                                        {
                                            "dataType":  14,
                                            "category":  22,
                                            "nameResourceKey":  "cloudPrintDiscoveryMaxLimitName",
                                            "descriptionResourceKey":  "cloudPrintDiscoveryMaxLimitDescription",
                                            "emptyValueResourceKey":  "cloudPrintDiscoveryMaxLimitExample",
                                            "childSettings":  [
                                                              ],
                                            "options":  [
                                                        ],
                                            "entityKey":  "enterpriseCloudPrintDiscoveryMaxLimit",
                                            "booleanActions":  0,
                                            "policyType":  79,
                                            "enabled":  true
                                        },
                                        {
                                            "dataType":  20,
                                            "category":  22,
                                            "nameResourceKey":  "mopriaDiscoveryResourceIdName",
                                            "descriptionResourceKey":  "mopriaDiscoveryResourceIdDescription",
                                            "emptyValueResourceKey":  "mopriaDiscoveryResourceIdExample",
                                            "childSettings":  [
                                                              ],
                                            "options":  [
                                                        ],
                                            "entityKey":  "enterpriseCloudPrintMopriaDiscoveryResourceIdentifier",
                                            "booleanActions":  0,
                                            "defaultValue":  "",
                                            "unconfiguredValue":  "",
                                            "policyType":  79,
                                            "enabled":  true
                                        }
                                    ]
 }
--- a/Documentation/ObjectInfo/complianceemailprofile_complianceios.json
+++ b/Documentation/ObjectInfo/complianceemailprofile_complianceios.json
@@ -1,34 +0,0 @@
 {
    "complianceemailprofile_complianceios":  {
                                                 "isSettingDescription":  false,
                                                 "showAsSectionHeader":  false,
                                                 "dataType":  8,
                                                 "category":  66,
                                                 "nameResourceKey":  "complianceEmailProfileHeader",
                                                 "childSettings":  [
                                                                       {
                                                                           "dataType":  0,
                                                                           "category":  66,
                                                                           "nameResourceKey":  "complianceEmailProfileRequired",
                                                                           "descriptionResourceKey":  "complianceEmailProfileRequiredDescription",
                                                                           "childSettings":  [
                                                                                             ],
                                                                           "options":  [
                                                                                       ],
                                                                           "entityKey":  "managedEmailProfileRequired",
                                                                           "booleanActions":  1,
                                                                           "defaultValue":  false,
                                                                           "policyType":  33,
                                                                           "enabled":  true
                                                                       }
                                                                   ],
                                                 "options":  [
                                                             ],
                                                 "booleanActions":  0,
                                                 "policyType":  33,
                                                 "enabled":  true
                                             }
 }
--- a/Documentation/ObjectInfo/connecteddevices_iosgeneral.json
+++ b/Documentation/ObjectInfo/connecteddevices_iosgeneral.json
@@ -1,303 +0,0 @@
 {
    "connecteddevices_iosgeneral":  [
                                        {
                                            "isSettingDescription":  false,
                                            "showAsSectionHeader":  true,
                                            "dataType":  8,
                                            "category":  23,
                                            "nameResourceKey":  "allEnrollmentTypesHeaderName",
                                            "descriptionResourceKey":  "allEnrollmentTypesHeaderDescription",
                                            "childSettings":  [
                                                                  {
                                                                      "dataType":  0,
                                                                      "category":  23,
                                                                      "nameResourceKey":  "forceWatchWristDetectionName",
                                                                      "descriptionResourceKey":  "forceWatchWristDetectionDescription",
                                                                      "childSettings":  [
                                                                                        ],
                                                                      "options":  [
                                                                                  ],
                                                                      "entityKey":  "appleWatchForceWristDetection",
                                                                      "booleanActions":  9,
                                                                      "defaultValue":  false,
                                                                      "policyType":  46,
                                                                      "enabled":  true
                                                                  }
                                                              ],
                                            "options":  [
                                                        ],
                                            "booleanActions":  0,
                                            "policyType":  46,
                                            "enabled":  true
                                        },
                                        {
                                            "isSettingDescription":  false,
                                            "showAsSectionHeader":  true,
                                            "dataType":  8,
                                            "category":  23,
                                            "nameResourceKey":  "deviceEnrollmentAndAutomatedDeviceEnrollmentHeaderName",
                                            "descriptionResourceKey":  "deviceEnrollmentAndAutomatedDeviceEnrollmentHeaderDescription",
                                            "childSettings":  [
                                                                  {
                                                                      "dataType":  0,
                                                                      "category":  23,
                                                                      "nameResourceKey":  "forceAirPlayOutgoingRequestsPairingPasswordName",
                                                                      "descriptionResourceKey":  "forceAirPlayOutgoingRequestsPairingPasswordDescription",
                                                                      "childSettings":  [
                                                                                        ],
                                                                      "options":  [
                                                                                  ],
                                                                      "entityKey":  "airPlayForcePairingPasswordForOutgoingRequests",
                                                                      "booleanActions":  9,
                                                                      "defaultValue":  false,
                                                                      "policyType":  46,
                                                                      "enabled":  true
                                                                  },
                                                                  {
                                                                      "dataType":  0,
                                                                      "category":  23,
                                                                      "nameResourceKey":  "autoUnlockBlockedName",
                                                                      "descriptionResourceKey":  "autoUnlockBlockedDescription",
                                                                      "childSettings":  [
                                                                                        ],
                                                                      "options":  [
                                                                                  ],
                                                                      "entityKey":  "autoUnlockBlocked",
                                                                      "booleanActions":  9,
                                                                      "defaultValue":  false,
                                                                      "policyType":  46,
                                                                      "enabled":  true
                                                                  }
                                                              ],
                                            "options":  [
                                                        ],
                                            "booleanActions":  0,
                                            "policyType":  46,
                                            "enabled":  true
                                        },
                                        {
                                            "isSettingDescription":  false,
                                            "showAsSectionHeader":  true,
                                            "dataType":  8,
                                            "category":  23,
                                            "nameResourceKey":  "automatedDeviceEnrollmentHeaderName",
                                            "descriptionResourceKey":  "automatedDeviceEnrollmentHeaderDescription",
                                            "childSettings":  [
                                                                  {
                                                                      "dataType":  0,
                                                                      "category":  23,
                                                                      "nameResourceKey":  "blockAirDropName",
                                                                      "childSettings":  [
                                                                                        ],
                                                                      "options":  [
                                                                                  ],
                                                                      "entityKey":  "airDropBlocked",
                                                                      "booleanActions":  9,
                                                                      "defaultValue":  false,
                                                                      "policyType":  46,
                                                                      "enabled":  true
                                                                  },
                                                                  {
                                                                      "dataType":  0,
                                                                      "category":  23,
                                                                      "nameResourceKey":  "blockAppleWatchPairingName",
                                                                      "childSettings":  [
                                                                                        ],
                                                                      "options":  [
                                                                                  ],
                                                                      "entityKey":  "appleWatchBlockPairing",
                                                                      "booleanActions":  9,
                                                                      "defaultValue":  false,
                                                                      "policyType":  46,
                                                                      "enabled":  true
                                                                  },
                                                                  {
                                                                      "dataType":  0,
                                                                      "category":  23,
                                                                      "nameResourceKey":  "blockBluetoothModificationName",
                                                                      "descriptionResourceKey":  "blockBluetoothModificationDescription",
                                                                      "childSettings":  [
                                                                                        ],
                                                                      "options":  [
                                                                                  ],
                                                                      "entityKey":  "bluetoothBlockModification",
                                                                      "booleanActions":  9,
                                                                      "defaultValue":  false,
                                                                      "policyType":  46,
                                                                      "enabled":  true
                                                                  },
                                                                  {
                                                                      "dataType":  0,
                                                                      "category":  23,
                                                                      "nameResourceKey":  "blockHostPairingName",
                                                                      "descriptionResourceKey":  "blockHostPairingDescription",
                                                                      "childSettings":  [
                                                                                        ],
                                                                      "options":  [
                                                                                  ],
                                                                      "entityKey":  "hostPairingBlocked",
                                                                      "booleanActions":  9,
                                                                      "defaultValue":  false,
                                                                      "policyType":  46,
                                                                      "enabled":  true
                                                                  },
                                                                  {
                                                                      "dataType":  0,
                                                                      "category":  23,
                                                                      "nameResourceKey":  "blockAirPrintNameIOS",
                                                                      "childSettings":  [
                                                                                            {
                                                                                                "dataType":  0,
                                                                                                "category":  23,
                                                                                                "nameResourceKey":  "blockAirPrintCredentialsStorageName",
                                                                                                "descriptionResourceKey":  "blockAirPrintCredentialsStorageDescription",
                                                                                                "childSettings":  [
                                                                                                                  ],
                                                                                                "options":  [
                                                                                                            ],
                                                                                                "entityKey":  "airPrintBlockCredentialsStorage",
                                                                                                "booleanActions":  3,
                                                                                                "defaultValue":  false,
                                                                                                "policyType":  46,
                                                                                                "enabled":  true
                                                                                            },
                                                                                            {
                                                                                                "dataType":  0,
                                                                                                "category":  23,
                                                                                                "nameResourceKey":  "forceAirPrintTrustedTLSNameIOS",
                                                                                                "descriptionResourceKey":  "forceAirPrintTrustedTLSDescriptionIOS",
                                                                                                "childSettings":  [
                                                                                                                  ],
                                                                                                "options":  [
                                                                                                            ],
                                                                                                "entityKey":  "airPrintForceTrustedTLS",
                                                                                                "booleanActions":  9,
                                                                                                "defaultValue":  false,
                                                                                                "policyType":  46,
                                                                                                "enabled":  true
                                                                                            },
                                                                                            {
                                                                                                "dataType":  0,
                                                                                                "category":  23,
                                                                                                "nameResourceKey":  "blockAirPrintiBeaconDiscoveryNameIOS",
                                                                                                "descriptionResourceKey":  "blockAirPrintiBeaconDiscoveryDescription",
                                                                                                "childSettings":  [
                                                                                                                  ],
                                                                                                "options":  [
                                                                                                            ],
                                                                                                "entityKey":  "airPrintBlockiBeaconDiscovery",
                                                                                                "booleanActions":  9,
                                                                                                "defaultValue":  false,
                                                                                                "policyType":  46,
                                                                                                "enabled":  true
                                                                                            }
                                                                                        ],
                                                                      "options":  [
                                                                                  ],
                                                                      "entityKey":  "airPrintBlocked",
                                                                      "booleanActions":  9,
                                                                      "defaultValue":  false,
                                                                      "policyType":  46,
                                                                      "enabled":  true
                                                                  },
                                                                  {
                                                                      "dataType":  0,
                                                                      "category":  23,
                                                                      "nameResourceKey":  "blockProximitySetupToNewDeviceName",
                                                                      "descriptionResourceKey":  "blockProximitySetupToNewDeviceDescription",
                                                                      "childSettings":  [
                                                                                        ],
                                                                      "options":  [
                                                                                  ],
                                                                      "entityKey":  "proximityBlockSetupToNewDevice",
                                                                      "booleanActions":  9,
                                                                      "defaultValue":  false,
                                                                      "policyType":  46,
                                                                      "enabled":  true
                                                                  },
                                                                  {
                                                                      "dataType":  0,
                                                                      "category":  23,
                                                                      "nameResourceKey":  "blockFilesUsbDriveAccessName",
                                                                      "descriptionResourceKey":  "blockFilesUsbDriveAccessDescription",
                                                                      "childSettings":  [
                                                                                        ],
                                                                      "options":  [
                                                                                  ],
                                                                      "entityKey":  "filesUsbDriveAccessBlocked",
                                                                      "booleanActions":  9,
                                                                      "defaultValue":  false,
                                                                      "policyType":  46,
                                                                      "enabled":  true
                                                                  },
                                                                  {
                                                                      "dataType":  0,
                                                                      "category":  23,
                                                                      "nameResourceKey":  "nfcBlockedName",
                                                                      "descriptionResourceKey":  "nfcBlockedDescription",
                                                                      "childSettings":  [
                                                                                        ],
                                                                      "options":  [
                                                                                  ],
                                                                      "entityKey":  "nfcBlocked",
                                                                      "booleanActions":  9,
                                                                      "defaultValue":  false,
                                                                      "policyType":  46,
                                                                      "enabled":  true
                                                                  },
                                                                  {
                                                                      "dataType":  0,
                                                                      "category":  23,
                                                                      "nameResourceKey":  "unpairedExternalBootToRecoveryAllowedName",
                                                                      "descriptionResourceKey":  "unpairedExternalBootToRecoveryAllowedDescription",
                                                                      "childSettings":  [
                                                                                        ],
                                                                      "options":  [
                                                                                  ],
                                                                      "entityKey":  "unpairedExternalBootToRecoveryAllowed",
                                                                      "booleanActions":  9,
                                                                      "defaultValue":  false,
                                                                      "policyType":  46,
                                                                      "enabled":  true
                                                                  }
                                                              ],
                                            "options":  [
                                                        ],
                                            "booleanActions":  0,
                                            "policyType":  46,
                                            "enabled":  true
                                        }
                                    ]
 }
--- a/Documentation/ObjectInfo/connecteddevices_macgeneral.json
+++ b/Documentation/ObjectInfo/connecteddevices_macgeneral.json
@@ -1,51 +0,0 @@
 {
    "connecteddevices_macgeneral":  {
                                        "isSettingDescription":  false,
                                        "showAsSectionHeader":  true,
                                        "dataType":  8,
                                        "category":  23,
                                        "nameResourceKey":  "allEnrollmentTypesHeaderNameMac",
                                        "descriptionResourceKey":  "allEnrollmentTypesHeaderDescriptionMac",
                                        "childSettings":  [
                                                              {
                                                                  "dataType":  0,
                                                                  "category":  23,
                                                                  "nameResourceKey":  "blockAirDropNameMacOS",
                                                                  "childSettings":  [
                                                                                    ],
                                                                  "options":  [
                                                                              ],
                                                                  "entityKey":  "airDropBlocked",
                                                                  "booleanActions":  9,
                                                                  "defaultValue":  false,
                                                                  "policyType":  61,
                                                                  "enabled":  true
                                                              },
                                                              {
                                                                  "dataType":  0,
                                                                  "category":  23,
                                                                  "nameResourceKey":  "blockAppleWatchAutoUnlockName",
                                                                  "descriptionResourceKey":  "blockAppleWatchAutoUnlockDescription",
                                                                  "childSettings":  [
                                                                                    ],
                                                                  "options":  [
                                                                              ],
                                                                  "entityKey":  "appleWatchBlockAutoUnlock",
                                                                  "booleanActions":  9,
                                                                  "defaultValue":  false,
                                                                  "policyType":  61,
                                                                  "enabled":  true
                                                              }
                                                          ],
                                        "options":  [
                                                    ],
                                        "booleanActions":  0,
                                        "policyType":  61,
                                        "enabled":  true
                                    }
 }
--- a/Documentation/ObjectInfo/connectivity_androidgeneral.json
+++ b/Documentation/ObjectInfo/connectivity_androidgeneral.json
@@ -1,140 +0,0 @@
 {
    "connectivity_androidgeneral":  [
                                        {
                                            "dataType":  0,
                                            "category":  24,
                                            "nameResourceKey":  "knoxBlockDataRoamingName",
                                            "descriptionResourceKey":  "BlockDataRoamingAndroidDescription",
                                            "childSettings":  [
                                                              ],
                                            "options":  [
                                                        ],
                                            "entityKey":  "cellularBlockDataRoaming",
                                            "booleanActions":  3,
                                            "defaultValue":  false,
                                            "policyType":  20,
                                            "enabled":  true
                                        },
                                        {
                                            "dataType":  0,
                                            "category":  24,
                                            "nameResourceKey":  "blockSMSAndMMSName",
                                            "descriptionResourceKey":  "blockSMSAndMMSAndroidDescription",
                                            "childSettings":  [
                                                              ],
                                            "options":  [
                                                        ],
                                            "entityKey":  "cellularBlockMessaging",
                                            "booleanActions":  3,
                                            "defaultValue":  false,
                                            "policyType":  20,
                                            "enabled":  true
                                        },
                                        {
                                            "dataType":  0,
                                            "category":  24,
                                            "nameResourceKey":  "knoxBlockVoiceDialingName",
                                            "descriptionResourceKey":  "blockVoiceDialingAndroidDescription",
                                            "childSettings":  [
                                                              ],
                                            "options":  [
                                                        ],
                                            "entityKey":  "voiceDialingBlocked",
                                            "booleanActions":  3,
                                            "defaultValue":  false,
                                            "policyType":  20,
                                            "enabled":  true
                                        },
                                        {
                                            "dataType":  0,
                                            "category":  24,
                                            "nameResourceKey":  "knoxBlockVoiceRoamingName",
                                            "descriptionResourceKey":  "blockVoiceRoamingAndroidDescription",
                                            "childSettings":  [
                                                              ],
                                            "options":  [
                                                        ],
                                            "entityKey":  "cellularBlockVoiceRoaming",
                                            "booleanActions":  3,
                                            "defaultValue":  false,
                                            "policyType":  20,
                                            "enabled":  true
                                        },
                                        {
                                            "dataType":  0,
                                            "category":  24,
                                            "nameResourceKey":  "knoxBlockBluetoothName",
                                            "descriptionResourceKey":  "blockBluetoothAndroidDescription",
                                            "childSettings":  [
                                                              ],
                                            "options":  [
                                                        ],
                                            "entityKey":  "bluetoothBlocked",
                                            "booleanActions":  3,
                                            "defaultValue":  false,
                                            "policyType":  20,
                                            "enabled":  true
                                        },
                                        {
                                            "dataType":  0,
                                            "category":  24,
                                            "nameResourceKey":  "knoxBlockNFCName",
                                            "descriptionResourceKey":  "blockNFCAndroidDescription",
                                            "childSettings":  [
                                                              ],
                                            "options":  [
                                                        ],
                                            "entityKey":  "nfcBlocked",
                                            "booleanActions":  3,
                                            "defaultValue":  false,
                                            "policyType":  20,
                                            "enabled":  true
                                        },
                                        {
                                            "dataType":  0,
                                            "category":  24,
                                            "nameResourceKey":  "knoxBlockWiFiName",
                                            "descriptionResourceKey":  "blockWiFiAndroidDescription",
                                            "childSettings":  [
                                                              ],
                                            "options":  [
                                                        ],
                                            "entityKey":  "wiFiBlocked",
                                            "booleanActions":  3,
                                            "defaultValue":  false,
                                            "policyType":  20,
                                            "enabled":  true
                                        },
                                        {
                                            "dataType":  0,
                                            "category":  24,
                                            "nameResourceKey":  "knoxBlockWiFiTetheringName",
                                            "descriptionResourceKey":  "blockWiFiTetheringAndroidDescription",
                                            "childSettings":  [
                                                              ],
                                            "options":  [
                                                        ],
                                            "entityKey":  "cellularBlockWiFiTethering",
                                            "booleanActions":  3,
                                            "defaultValue":  false,
                                            "policyType":  20,
                                            "enabled":  true
                                        }
                                    ]
 }
--- a/Documentation/ObjectInfo/connectivity_windows10general.json
+++ b/Documentation/ObjectInfo/connectivity_windows10general.json
@@ -1,327 +0,0 @@
 {
    "connectivity_windows10general":  [
                                          {
                                              "dataType":  16,
                                              "category":  24,
                                              "nameResourceKey":  "cellularDataName",
                                              "descriptionResourceKey":  "cellularDataDescription",
                                              "childSettings":  [
                                                                ],
                                              "options":  [
                                                              {
                                                                  "nameResourceKey":  "notConfigured",
                                                                  "value":  "allowed",
                                                                  "enabled":  true
                                                              },
                                                              {
                                                                  "nameResourceKey":  "blockOption",
                                                                  "value":  "blocked",
                                                                  "enabled":  true
                                                              },
                                                              {
                                                                  "nameResourceKey":  "allowNotEditableOption",
                                                                  "value":  "required",
                                                                  "enabled":  true
                                                              }
                                                          ],
                                              "entityKey":  "cellularData",
                                              "booleanActions":  0,
                                              "defaultValue":  "allowed",
                                              "unconfiguredValue":  "allowed",
                                              "policyType":  79,
                                              "enabled":  true
                                          },
                                          {
                                              "dataType":  0,
                                              "category":  24,
                                              "nameResourceKey":  "blockDataRoamingName",
                                              "descriptionResourceKey":  "blockDataRoamingDescription",
                                              "childSettings":  [
                                                                ],
                                              "options":  [
                                                          ],
                                              "entityKey":  "cellularBlockDataWhenRoaming",
                                              "booleanActions":  3,
                                              "defaultValue":  false,
                                              "policyType":  79,
                                              "enabled":  true
                                          },
                                          {
                                              "dataType":  0,
                                              "category":  24,
                                              "nameResourceKey":  "vpnOverCellularName",
                                              "descriptionResourceKey":  "empty",
                                              "childSettings":  [
                                                                ],
                                              "options":  [
                                                          ],
                                              "entityKey":  "cellularBlockVpn",
                                              "booleanActions":  3,
                                              "defaultValue":  false,
                                              "policyType":  79,
                                              "enabled":  true
                                          },
                                          {
                                              "dataType":  0,
                                              "category":  24,
                                              "nameResourceKey":  "vpnRoamingOverCellularName",
                                              "descriptionResourceKey":  "empty",
                                              "childSettings":  [
                                                                ],
                                              "options":  [
                                                          ],
                                              "entityKey":  "cellularBlockVpnWhenRoaming",
                                              "booleanActions":  3,
                                              "defaultValue":  false,
                                              "policyType":  79,
                                              "enabled":  true
                                          },
                                          {
                                              "dataType":  0,
                                              "category":  24,
                                              "nameResourceKey":  "blockConnectedDevicesServiceName",
                                              "descriptionResourceKey":  "blockConnectedDevicesServiceDescription",
                                              "childSettings":  [
                                                                ],
                                              "options":  [
                                                          ],
                                              "entityKey":  "connectedDevicesServiceBlocked",
                                              "booleanActions":  3,
                                              "defaultValue":  false,
                                              "policyType":  79,
                                              "enabled":  true
                                          },
                                          {
                                              "dataType":  0,
                                              "category":  24,
                                              "nameResourceKey":  "blockNFCName",
                                              "descriptionResourceKey":  "blockNFCDescription",
                                              "childSettings":  [
                                                                ],
                                              "options":  [
                                                          ],
                                              "entityKey":  "nfcBlocked",
                                              "booleanActions":  3,
                                              "defaultValue":  false,
                                              "policyType":  79,
                                              "enabled":  true
                                          },
                                          {
                                              "dataType":  0,
                                              "category":  24,
                                              "nameResourceKey":  "blockWiFiName",
                                              "descriptionResourceKey":  "blockWiFiDescription",
                                              "childSettings":  [
                                                                ],
                                              "options":  [
                                                          ],
                                              "entityKey":  "wiFiBlocked",
                                              "booleanActions":  3,
                                              "defaultValue":  false,
                                              "policyType":  79,
                                              "enabled":  true
                                          },
                                          {
                                              "dataType":  0,
                                              "category":  24,
                                              "nameResourceKey":  "blockWiFiHotspotAutoConnectName",
                                              "descriptionResourceKey":  "blockWiFiHotspotAutoConnectDescription",
                                              "childSettings":  [
                                                                ],
                                              "options":  [
                                                          ],
                                              "entityKey":  "wiFiBlockAutomaticConnectHotspots",
                                              "booleanActions":  3,
                                              "defaultValue":  false,
                                              "policyType":  79,
                                              "enabled":  true
                                          },
                                          {
                                              "dataType":  0,
                                              "category":  24,
                                              "nameResourceKey":  "blockManualWifiConfigurationName",
                                              "descriptionResourceKey":  "blockManualWifiConfigurationDescription",
                                              "childSettings":  [
                                                                ],
                                              "options":  [
                                                          ],
                                              "entityKey":  "wiFiBlockManualConfiguration",
                                              "booleanActions":  3,
                                              "defaultValue":  false,
                                              "policyType":  79,
                                              "enabled":  true
                                          },
                                          {
                                              "dataType":  14,
                                              "category":  24,
                                              "nameResourceKey":  "wiFiScanIntervalName",
                                              "descriptionResourceKey":  "wiFiScanIntervalDescription",
                                              "emptyValueResourceKey":  "wifiScanIntervalPlaceholder",
                                              "childSettings":  [
                                                                ],
                                              "options":  [
                                                          ],
                                              "entityKey":  "wiFiScanInterval",
                                              "booleanActions":  0,
                                              "policyType":  79,
                                              "enabled":  true
                                          },
                                          {
                                              "isSettingDescription":  false,
                                              "showAsSectionHeader":  false,
                                              "dataType":  8,
                                              "category":  24,
                                              "nameResourceKey":  "win10BluetoothHeader",
                                              "childSettings":  [
                                                                ],
                                              "options":  [
                                                          ],
                                              "booleanActions":  0,
                                              "policyType":  79,
                                              "enabled":  true
                                          },
                                          {
                                              "dataType":  0,
                                              "category":  24,
                                              "nameResourceKey":  "blockBluetoothName",
                                              "descriptionResourceKey":  "blockBluetoothDescription",
                                              "childSettings":  [
                                                                ],
                                              "options":  [
                                                          ],
                                              "entityKey":  "bluetoothBlocked",
                                              "booleanActions":  3,
                                              "defaultValue":  false,
                                              "policyType":  79,
                                              "enabled":  true
                                          },
                                          {
                                              "dataType":  0,
                                              "category":  24,
                                              "nameResourceKey":  "blockBluetoothDiscoverableModeName",
                                              "descriptionResourceKey":  "blockBluetoothDiscoverableModeDescription",
                                              "childSettings":  [
                                                                ],
                                              "options":  [
                                                          ],
                                              "entityKey":  "bluetoothBlockDiscoverableMode",
                                              "booleanActions":  3,
                                              "defaultValue":  false,
                                              "policyType":  79,
                                              "enabled":  true
                                          },
                                          {
                                              "dataType":  0,
                                              "category":  24,
                                              "nameResourceKey":  "blockBluetoothPrepairingName",
                                              "descriptionResourceKey":  "blockBluetoothPrepairingDescription",
                                              "childSettings":  [
                                                                ],
                                              "options":  [
                                                          ],
                                              "entityKey":  "bluetoothBlockPrePairing",
                                              "booleanActions":  3,
                                              "defaultValue":  false,
                                              "policyType":  79,
                                              "enabled":  true
                                          },
                                          {
                                              "dataType":  0,
                                              "category":  24,
                                              "nameResourceKey":  "blockBluetoothAdvertisingName",
                                              "descriptionResourceKey":  "blockBluetoothAdvertisingDescription",
                                              "childSettings":  [
                                                                ],
                                              "options":  [
                                                          ],
                                              "entityKey":  "bluetoothBlockAdvertising",
                                              "booleanActions":  3,
                                              "defaultValue":  false,
                                              "policyType":  79,
                                              "enabled":  true
                                          },
                                          {
                                              "dataType":  0,
                                              "category":  24,
                                              "nameResourceKey":  "bluetoothBlockPromptedProximalConnectionsName",
                                              "descriptionResourceKey":  "bluetoothBlockPromptedProximalConnectionsDescription",
                                              "childSettings":  [
                                                                ],
                                              "options":  [
                                                          ],
                                              "entityKey":  "bluetoothBlockPromptedProximalConnections",
                                              "booleanActions":  3,
                                              "defaultValue":  false,
                                              "unconfiguredValue":  false,
                                              "policyType":  79,
                                              "enabled":  true
                                          },
                                          {
                                              "columns":  [
                                                              {
                                                                  "metadata":  {
                                                                                   "dataType":  20,
                                                                                   "category":  24,
                                                                                   "nameResourceKey":  "bluetoothAllowedServicesName",
                                                                                   "emptyValueResourceKey":  "guidExample",
                                                                                   "childSettings":  [
                                                                                                     ],
                                                                                   "options":  [
                                                                                               ],
                                                                                   "entityKey":  "guidExample",
                                                                                   "booleanActions":  0,
                                                                                   "policyType":  79,
                                                                                   "enabled":  true
                                                                               }
                                                              }
                                                          ],
                                              "dataType":  21,
                                              "category":  24,
                                              "nameResourceKey":  "bluetoothAllowedServicesName",
                                              "descriptionResourceKey":  "bluetoothAllowedServicesDescription",
                                              "childSettings":  [
                                                                ],
                                              "options":  [
                                                          ],
                                              "entityKey":  "bluetoothAllowedServices",
                                              "booleanActions":  0,
                                              "policyType":  79,
                                              "enabled":  true
                                          }
                                      ]
 }
--- a/Documentation/ObjectInfo/connectivity_windowsphonegeneral.json
+++ b/Documentation/ObjectInfo/connectivity_windowsphonegeneral.json
@@ -1,106 +0,0 @@
 {
    "connectivity_windowsphonegeneral":  [
                                             {
                                                 "dataType":  0,
                                                 "category":  24,
                                                 "nameResourceKey":  "blockWiFiName",
                                                 "descriptionResourceKey":  "blockWiFiDescription",
                                                 "childSettings":  [
                                                                   ],
                                                 "options":  [
                                                             ],
                                                 "entityKey":  "wifiBlocked",
                                                 "booleanActions":  3,
                                                 "defaultValue":  false,
                                                 "policyType":  101,
                                                 "enabled":  true
                                             },
                                             {
                                                 "dataType":  0,
                                                 "category":  24,
                                                 "nameResourceKey":  "blockWiFiTetheringName",
                                                 "descriptionResourceKey":  "empty",
                                                 "childSettings":  [
                                                                   ],
                                                 "options":  [
                                                             ],
                                                 "entityKey":  "cellularBlockWifiTethering",
                                                 "booleanActions":  3,
                                                 "defaultValue":  false,
                                                 "policyType":  101,
                                                 "enabled":  true
                                             },
                                             {
                                                 "dataType":  0,
                                                 "category":  24,
                                                 "nameResourceKey":  "blockWiFiHotspotAutoConnectName",
                                                 "descriptionResourceKey":  "blockWiFiHotspotAutoConnectDescription",
                                                 "childSettings":  [
                                                                   ],
                                                 "options":  [
                                                             ],
                                                 "entityKey":  "wifiBlockAutomaticConnectHotspots",
                                                 "booleanActions":  3,
                                                 "defaultValue":  false,
                                                 "policyType":  101,
                                                 "enabled":  true
                                             },
                                             {
                                                 "dataType":  0,
                                                 "category":  24,
                                                 "nameResourceKey":  "blockWiFiHotspotReportingName",
                                                 "descriptionResourceKey":  "blockWiFiHotspotReportingDescription",
                                                 "childSettings":  [
                                                                   ],
                                                 "options":  [
                                                             ],
                                                 "entityKey":  "wifiBlockHotspotReporting",
                                                 "booleanActions":  3,
                                                 "defaultValue":  false,
                                                 "policyType":  101,
                                                 "enabled":  true
                                             },
                                             {
                                                 "dataType":  0,
                                                 "category":  24,
                                                 "nameResourceKey":  "blockNFCName",
                                                 "descriptionResourceKey":  "blockNFCDescription",
                                                 "childSettings":  [
                                                                   ],
                                                 "options":  [
                                                             ],
                                                 "entityKey":  "nfcBlocked",
                                                 "booleanActions":  3,
                                                 "defaultValue":  false,
                                                 "policyType":  101,
                                                 "enabled":  true
                                             },
                                             {
                                                 "dataType":  0,
                                                 "category":  24,
                                                 "nameResourceKey":  "blockBluetoothName",
                                                 "descriptionResourceKey":  "blockBluetoothDescription",
                                                 "childSettings":  [
                                                                   ],
                                                 "options":  [
                                                             ],
                                                 "entityKey":  "bluetoothBlocked",
                                                 "booleanActions":  3,
                                                 "defaultValue":  false,
                                                 "policyType":  101,
                                                 "enabled":  true
                                             }
                                         ]
 }
--- a/Documentation/ObjectInfo/contentcaching_macdevicefeatures.json
+++ b/Documentation/ObjectInfo/contentcaching_macdevicefeatures.json
@@ -1,795 +0,0 @@
 {
    "contentcaching_macdevicefeatures":  {
                                             "isSettingDescription":  false,
                                             "showAsSectionHeader":  true,
                                             "dataType":  8,
                                             "category":  25,
                                             "nameResourceKey":  "allEnrollmentTypesHeaderNameMac",
                                             "descriptionResourceKey":  "allEnrollmentTypesHeaderDescriptionMac",
                                             "childSettings":  [
                                                                   {
                                                                       "dataType":  0,
                                                                       "category":  25,
                                                                       "nameResourceKey":  "contentCachingEnabledName",
                                                                       "descriptionResourceKey":  "contentCachingEnabledDescription",
                                                                       "childSettings":  [
                                                                                             {
                                                                                                 "dataType":  16,
                                                                                                 "category":  25,
                                                                                                 "nameResourceKey":  "contentCachingTypeName",
                                                                                                 "descriptionResourceKey":  "contentCachingTypeDescription",
                                                                                                 "childSettings":  [
                                                                                                                   ],
                                                                                                 "options":  [
                                                                                                                 {
                                                                                                                     "nameResourceKey":  "contentCachingTypeAllContentOption",
                                                                                                                     "value":  "notConfigured",
                                                                                                                     "enabled":  true
                                                                                                                 },
                                                                                                                 {
                                                                                                                     "nameResourceKey":  "contentCachingTypeUserContentOnlyOption",
                                                                                                                     "value":  "userContentOnly",
                                                                                                                     "enabled":  true
                                                                                                                 },
                                                                                                                 {
                                                                                                                     "nameResourceKey":  "contentCachingTypeSharedContentOnlyOption",
                                                                                                                     "value":  "sharedContentOnly",
                                                                                                                     "enabled":  true
                                                                                                                 }
                                                                                                             ],
                                                                                                 "entityKey":  "contentCachingType",
                                                                                                 "booleanActions":  0,
                                                                                                 "defaultValue":  "notConfigured",
                                                                                                 "policyType":  58,
                                                                                                 "enabled":  true
                                                                                             },
                                                                                             {
                                                                                                 "dataType":  15,
                                                                                                 "category":  25,
                                                                                                 "nameResourceKey":  "contentCachingMaxSizeBytesName",
                                                                                                 "descriptionResourceKey":  "contentCachingMaxSizeBytesDescription",
                                                                                                 "emptyValueResourceKey":  "contentCachingMaxSizeBytesEmptyValue",
                                                                                                 "childSettings":  [
                                                                                                                   ],
                                                                                                 "options":  [
                                                                                                             ],
                                                                                                 "entityKey":  "contentCachingMaxSizeBytes",
                                                                                                 "booleanActions":  0,
                                                                                                 "defaultValue":  0,
                                                                                                 "policyType":  58,
                                                                                                 "enabled":  true
                                                                                             },
                                                                                             {
                                                                                                 "dataType":  20,
                                                                                                 "category":  25,
                                                                                                 "nameResourceKey":  "contentCachingDataPathName",
                                                                                                 "descriptionResourceKey":  "contentCachingDataPathDescription",
                                                                                                 "emptyValueResourceKey":  "contentCachingDataPathEmptyValue",
                                                                                                 "childSettings":  [
                                                                                                                   ],
                                                                                                 "options":  [
                                                                                                             ],
                                                                                                 "entityKey":  "contentCachingDataPath",
                                                                                                 "booleanActions":  0,
                                                                                                 "policyType":  58,
                                                                                                 "enabled":  true
                                                                                             },
                                                                                             {
                                                                                                 "dataType":  14,
                                                                                                 "category":  25,
                                                                                                 "nameResourceKey":  "contentCachingPortName",
                                                                                                 "descriptionResourceKey":  "contentCachingPortDescription",
                                                                                                 "childSettings":  [
                                                                                                                   ],
                                                                                                 "options":  [
                                                                                                             ],
                                                                                                 "entityKey":  "contentCachingPort",
                                                                                                 "booleanActions":  0,
                                                                                                 "defaultValue":  0,
                                                                                                 "policyType":  58,
                                                                                                 "enabled":  true
                                                                                             },
                                                                                             {
                                                                                                 "dataType":  0,
                                                                                                 "category":  25,
                                                                                                 "nameResourceKey":  "contentCachingDisableConnectionSharingName",
                                                                                                 "descriptionResourceKey":  "contentCachingDisableConnectionSharingDescription",
                                                                                                 "childSettings":  [
                                                                                                                       {
                                                                                                                           "dataType":  0,
                                                                                                                           "category":  25,
                                                                                                                           "nameResourceKey":  "contentCachingForceConnectionSharingName",
                                                                                                                           "descriptionResourceKey":  "contentCachingForceConnectionSharingDescription",
                                                                                                                           "childSettings":  [
                                                                                                                                             ],
                                                                                                                           "options":  [
                                                                                                                                       ],
                                                                                                                           "entityKey":  "contentCachingForceConnectionSharing",
                                                                                                                           "booleanActions":  9,
                                                                                                                           "policyType":  58,
                                                                                                                           "enabled":  true
                                                                                                                       }
                                                                                                                   ],
                                                                                                 "options":  [
                                                                                                             ],
                                                                                                 "entityKey":  "contentCachingDisableConnectionSharing",
                                                                                                 "booleanActions":  9,
                                                                                                 "policyType":  58,
                                                                                                 "enabled":  true
                                                                                             },
                                                                                             {
                                                                                                 "dataType":  0,
                                                                                                 "category":  25,
                                                                                                 "nameResourceKey":  "contentCachingLogClientIdentitiesName",
                                                                                                 "descriptionResourceKey":  "contentCachingLogClientIdentitiesDescription",
                                                                                                 "childSettings":  [
                                                                                                                   ],
                                                                                                 "options":  [
                                                                                                             ],
                                                                                                 "entityKey":  "contentCachingLogClientIdentities",
                                                                                                 "booleanActions":  9,
                                                                                                 "policyType":  58,
                                                                                                 "enabled":  true
                                                                                             },
                                                                                             {
                                                                                                 "dataType":  0,
                                                                                                 "category":  25,
                                                                                                 "nameResourceKey":  "contentCachingBlockDeletionName",
                                                                                                 "descriptionResourceKey":  "contentCachingBlockDeletionDescription",
                                                                                                 "childSettings":  [
                                                                                                                   ],
                                                                                                 "options":  [
                                                                                                             ],
                                                                                                 "entityKey":  "contentCachingBlockDeletion",
                                                                                                 "booleanActions":  9,
                                                                                                 "policyType":  58,
                                                                                                 "enabled":  true
                                                                                             },
                                                                                             {
                                                                                                 "dataType":  0,
                                                                                                 "category":  25,
                                                                                                 "nameResourceKey":  "contentCachingShowAlertsName",
                                                                                                 "descriptionResourceKey":  "contentCachingShowAlertsDescription",
                                                                                                 "childSettings":  [
                                                                                                                   ],
                                                                                                 "options":  [
                                                                                                             ],
                                                                                                 "entityKey":  "contentCachingShowAlerts",
                                                                                                 "booleanActions":  9,
                                                                                                 "policyType":  58,
                                                                                                 "enabled":  true
                                                                                             },
                                                                                             {
                                                                                                 "dataType":  0,
                                                                                                 "category":  25,
                                                                                                 "nameResourceKey":  "contentCachingKeepAwakeName",
                                                                                                 "descriptionResourceKey":  "contentCachingKeepAwakeDescription",
                                                                                                 "childSettings":  [
                                                                                                                   ],
                                                                                                 "options":  [
                                                                                                             ],
                                                                                                 "entityKey":  "contentCachingKeepAwake",
                                                                                                 "booleanActions":  9,
                                                                                                 "policyType":  58,
                                                                                                 "enabled":  true
                                                                                             },
                                                                                             {
                                                                                                 "dataType":  16,
                                                                                                 "category":  25,
                                                                                                 "nameResourceKey":  "contentCachingClientPolicyName",
                                                                                                 "descriptionResourceKey":  "contentCachingClientPolicyDescription",
                                                                                                 "childSettings":  [
                                                                                                                   ],
                                                                                                 "options":  [
                                                                                                                 {
                                                                                                                     "nameResourceKey":  "notConfigured",
                                                                                                                     "value":  "notConfigured",
                                                                                                                     "enabled":  true
                                                                                                                 },
                                                                                                                 {
                                                                                                                     "nameResourceKey":  "clientsInLocalNetworkOption",
                                                                                                                     "value":  "clientsInLocalNetwork",
                                                                                                                     "enabled":  true
                                                                                                                 },
                                                                                                                 {
                                                                                                                     "nameResourceKey":  "clientsWithSamePublicIpAddressOption",
                                                                                                                     "value":  "clientsWithSamePublicIpAddress",
                                                                                                                     "enabled":  true
                                                                                                                 },
                                                                                                                 {
                                                                                                                     "nameResourceKey":  "clientsInCustomLocalNetworksOption",
                                                                                                                     "value":  "clientsInCustomLocalNetworks",
                                                                                                                     "children":  [
                                                                                                                                      {
                                                                                                                                          "columns":  [
                                                                                                                                                          {
                                                                                                                                                              "metadata":  {
                                                                                                                                                                               "dataType":  16,
                                                                                                                                                                               "category":  25,
                                                                                                                                                                               "nameResourceKey":  "iPRangeAddressTypeName",
                                                                                                                                                                               "childSettings":  [
                                                                                                                                                                                                 ],
                                                                                                                                                                               "options":  [
                                                                                                                                                                                               {
                                                                                                                                                                                                   "nameResourceKey":  "notConfigured",
                                                                                                                                                                                                   "enabled":  true
                                                                                                                                                                                               },
                                                                                                                                                                                               {
                                                                                                                                                                                                   "nameResourceKey":  "iPv4Option",
                                                                                                                                                                                                   "value":  "#microsoft.graph.iPv4Range",
                                                                                                                                                                                                   "enabled":  true
                                                                                                                                                                                               },
                                                                                                                                                                                               {
                                                                                                                                                                                                   "nameResourceKey":  "iPv6Option",
                                                                                                                                                                                                   "value":  "#microsoft.graph.iPv6Range",
                                                                                                                                                                                                   "enabled":  true
                                                                                                                                                                                               }
                                                                                                                                                                                           ],
                                                                                                                                                                               "entityKey":  "@odata.type",
                                                                                                                                                                               "booleanActions":  0,
                                                                                                                                                                               "policyType":  58,
                                                                                                                                                                               "enabled":  true
                                                                                                                                                                           }
                                                                                                                                                          },
                                                                                                                                                          {
                                                                                                                                                              "metadata":  {
                                                                                                                                                                               "dataType":  20,
                                                                                                                                                                               "category":  25,
                                                                                                                                                                               "nameResourceKey":  "iPRangeLowerAddressName",
                                                                                                                                                                               "emptyValueResourceKey":  "iPRangeLowerAddressEmptyValue",
                                                                                                                                                                               "childSettings":  [
                                                                                                                                                                                                 ],
                                                                                                                                                                               "options":  [
                                                                                                                                                                                           ],
                                                                                                                                                                               "entityKey":  "lowerAddress",
                                                                                                                                                                               "booleanActions":  0,
                                                                                                                                                                               "policyType":  58,
                                                                                                                                                                               "enabled":  true
                                                                                                                                                                           }
                                                                                                                                                          },
                                                                                                                                                          {
                                                                                                                                                              "metadata":  {
                                                                                                                                                                               "dataType":  20,
                                                                                                                                                                               "category":  25,
                                                                                                                                                                               "nameResourceKey":  "iPRangeUpperAddressName",
                                                                                                                                                                               "emptyValueResourceKey":  "iPRangeUpperAddressEmptyValue",
                                                                                                                                                                               "childSettings":  [
                                                                                                                                                                                                 ],
                                                                                                                                                                               "options":  [
                                                                                                                                                                                           ],
                                                                                                                                                                               "entityKey":  "upperAddress",
                                                                                                                                                                               "booleanActions":  0,
                                                                                                                                                                               "policyType":  58,
                                                                                                                                                                               "enabled":  true
                                                                                                                                                                           }
                                                                                                                                                          }
                                                                                                                                                      ],
                                                                                                                                          "dataType":  21,
                                                                                                                                          "category":  25,
                                                                                                                                          "nameResourceKey":  "contentCachingClientListenRangesName",
                                                                                                                                          "descriptionResourceKey":  "contentCachingClientListenRangesDescription",
                                                                                                                                          "childSettings":  [
                                                                                                                                                            ],
                                                                                                                                          "options":  [
                                                                                                                                                      ],
                                                                                                                                          "entityKey":  "contentCachingClientListenRanges",
                                                                                                                                          "booleanActions":  0,
                                                                                                                                          "policyType":  58,
                                                                                                                                          "enabled":  true
                                                                                                                                      }
                                                                                                                                  ],
                                                                                                                     "enabled":  true
                                                                                                                 },
                                                                                                                 {
                                                                                                                     "nameResourceKey":  "clientsInCustomLocalNetworksWithFallbackOption",
                                                                                                                     "value":  "clientsInCustomLocalNetworksWithFallback",
                                                                                                                     "children":  [
                                                                                                                                      {
                                                                                                                                          "columns":  [
                                                                                                                                                          {
                                                                                                                                                              "metadata":  {
                                                                                                                                                                               "dataType":  16,
                                                                                                                                                                               "category":  25,
                                                                                                                                                                               "nameResourceKey":  "iPRangeAddressTypeName",
                                                                                                                                                                               "childSettings":  [
                                                                                                                                                                                                 ],
                                                                                                                                                                               "options":  [
                                                                                                                                                                                               {
                                                                                                                                                                                                   "nameResourceKey":  "notConfigured",
                                                                                                                                                                                                   "enabled":  true
                                                                                                                                                                                               },
                                                                                                                                                                                               {
                                                                                                                                                                                                   "nameResourceKey":  "iPv4Option",
                                                                                                                                                                                                   "value":  "#microsoft.graph.iPv4Range",
                                                                                                                                                                                                   "enabled":  true
                                                                                                                                                                                               },
                                                                                                                                                                                               {
                                                                                                                                                                                                   "nameResourceKey":  "iPv6Option",
                                                                                                                                                                                                   "value":  "#microsoft.graph.iPv6Range",
                                                                                                                                                                                                   "enabled":  true
                                                                                                                                                                                               }
                                                                                                                                                                                           ],
                                                                                                                                                                               "entityKey":  "@odata.type",
                                                                                                                                                                               "booleanActions":  0,
                                                                                                                                                                               "policyType":  58,
                                                                                                                                                                               "enabled":  true
                                                                                                                                                                           }
                                                                                                                                                          },
                                                                                                                                                          {
                                                                                                                                                              "metadata":  {
                                                                                                                                                                               "dataType":  20,
                                                                                                                                                                               "category":  25,
                                                                                                                                                                               "nameResourceKey":  "iPRangeLowerAddressName",
                                                                                                                                                                               "emptyValueResourceKey":  "iPRangeLowerAddressEmptyValue",
                                                                                                                                                                               "childSettings":  [
                                                                                                                                                                                                 ],
                                                                                                                                                                               "options":  [
                                                                                                                                                                                           ],
                                                                                                                                                                               "entityKey":  "lowerAddress",
                                                                                                                                                                               "booleanActions":  0,
                                                                                                                                                                               "policyType":  58,
                                                                                                                                                                               "enabled":  true
                                                                                                                                                                           }
                                                                                                                                                          },
                                                                                                                                                          {
                                                                                                                                                              "metadata":  {
                                                                                                                                                                               "dataType":  20,
                                                                                                                                                                               "category":  25,
                                                                                                                                                                               "nameResourceKey":  "iPRangeUpperAddressName",
                                                                                                                                                                               "emptyValueResourceKey":  "iPRangeUpperAddressEmptyValue",
                                                                                                                                                                               "childSettings":  [
                                                                                                                                                                                                 ],
                                                                                                                                                                               "options":  [
                                                                                                                                                                                           ],
                                                                                                                                                                               "entityKey":  "upperAddress",
                                                                                                                                                                               "booleanActions":  0,
                                                                                                                                                                               "policyType":  58,
                                                                                                                                                                               "enabled":  true
                                                                                                                                                                           }
                                                                                                                                                          }
                                                                                                                                                      ],
                                                                                                                                          "dataType":  21,
                                                                                                                                          "category":  25,
                                                                                                                                          "nameResourceKey":  "contentCachingClientListenRangesName",
                                                                                                                                          "descriptionResourceKey":  "contentCachingClientListenRangesDescription",
                                                                                                                                          "childSettings":  [
                                                                                                                                                            ],
                                                                                                                                          "options":  [
                                                                                                                                                      ],
                                                                                                                                          "entityKey":  "contentCachingClientListenRanges",
                                                                                                                                          "booleanActions":  0,
                                                                                                                                          "policyType":  58,
                                                                                                                                          "enabled":  true
                                                                                                                                      }
                                                                                                                                  ],
                                                                                                                     "enabled":  true
                                                                                                                 }
                                                                                                             ],
                                                                                                 "entityKey":  "contentCachingClientPolicy",
                                                                                                 "booleanActions":  0,
                                                                                                 "defaultValue":  "notConfigured",
                                                                                                 "policyType":  58,
                                                                                                 "enabled":  true
                                                                                             },
                                                                                             {
                                                                                                 "columns":  [
                                                                                                                 {
                                                                                                                     "metadata":  {
                                                                                                                                      "dataType":  16,
                                                                                                                                      "category":  25,
                                                                                                                                      "nameResourceKey":  "iPRangeAddressTypeName",
                                                                                                                                      "childSettings":  [
                                                                                                                                                        ],
                                                                                                                                      "options":  [
                                                                                                                                                      {
                                                                                                                                                          "nameResourceKey":  "notConfigured",
                                                                                                                                                          "enabled":  true
                                                                                                                                                      },
                                                                                                                                                      {
                                                                                                                                                          "nameResourceKey":  "iPv4Option",
                                                                                                                                                          "value":  "#microsoft.graph.iPv4Range",
                                                                                                                                                          "enabled":  true
                                                                                                                                                      },
                                                                                                                                                      {
                                                                                                                                                          "nameResourceKey":  "iPv6Option",
                                                                                                                                                          "value":  "#microsoft.graph.iPv6Range",
                                                                                                                                                          "enabled":  true
                                                                                                                                                      }
                                                                                                                                                  ],
                                                                                                                                      "entityKey":  "@odata.type",
                                                                                                                                      "booleanActions":  0,
                                                                                                                                      "policyType":  58,
                                                                                                                                      "enabled":  true
                                                                                                                                  }
                                                                                                                 },
                                                                                                                 {
                                                                                                                     "metadata":  {
                                                                                                                                      "dataType":  20,
                                                                                                                                      "category":  25,
                                                                                                                                      "nameResourceKey":  "iPRangeLowerAddressName",
                                                                                                                                      "emptyValueResourceKey":  "iPRangeLowerAddressEmptyValue",
                                                                                                                                      "childSettings":  [
                                                                                                                                                        ],
                                                                                                                                      "options":  [
                                                                                                                                                  ],
                                                                                                                                      "entityKey":  "lowerAddress",
                                                                                                                                      "booleanActions":  0,
                                                                                                                                      "policyType":  58,
                                                                                                                                      "enabled":  true
                                                                                                                                  }
                                                                                                                 },
                                                                                                                 {
                                                                                                                     "metadata":  {
                                                                                                                                      "dataType":  20,
                                                                                                                                      "category":  25,
                                                                                                                                      "nameResourceKey":  "iPRangeUpperAddressName",
                                                                                                                                      "emptyValueResourceKey":  "iPRangeUpperAddressEmptyValue",
                                                                                                                                      "childSettings":  [
                                                                                                                                                        ],
                                                                                                                                      "options":  [
                                                                                                                                                  ],
                                                                                                                                      "entityKey":  "upperAddress",
                                                                                                                                      "booleanActions":  0,
                                                                                                                                      "policyType":  58,
                                                                                                                                      "enabled":  true
                                                                                                                                  }
                                                                                                                 }
                                                                                                             ],
                                                                                                 "dataType":  21,
                                                                                                 "category":  25,
                                                                                                 "nameResourceKey":  "contentCachingPublicRangesName",
                                                                                                 "descriptionResourceKey":  "contentCachingPublicRangesDescription",
                                                                                                 "childSettings":  [
                                                                                                                   ],
                                                                                                 "options":  [
                                                                                                             ],
                                                                                                 "entityKey":  "contentCachingPublicRanges",
                                                                                                 "booleanActions":  0,
                                                                                                 "policyType":  58,
                                                                                                 "enabled":  true
                                                                                             },
                                                                                             {
                                                                                                 "dataType":  16,
                                                                                                 "category":  25,
                                                                                                 "nameResourceKey":  "contentCachingPeerPolicyName",
                                                                                                 "descriptionResourceKey":  "contentCachingPeerPolicyDescription",
                                                                                                 "childSettings":  [
                                                                                                                   ],
                                                                                                 "options":  [
                                                                                                                 {
                                                                                                                     "nameResourceKey":  "notConfigured",
                                                                                                                     "value":  "notConfigured",
                                                                                                                     "enabled":  true
                                                                                                                 },
                                                                                                                 {
                                                                                                                     "nameResourceKey":  "peersInLocalNetworkOption",
                                                                                                                     "value":  "peersInLocalNetwork",
                                                                                                                     "enabled":  true
                                                                                                                 },
                                                                                                                 {
                                                                                                                     "nameResourceKey":  "peersWithSamePublicIpAddressOption",
                                                                                                                     "value":  "peersWithSamePublicIpAddress",
                                                                                                                     "enabled":  true
                                                                                                                 },
                                                                                                                 {
                                                                                                                     "nameResourceKey":  "peersInCustomLocalNetworksOption",
                                                                                                                     "value":  "peersInCustomLocalNetworks",
                                                                                                                     "children":  [
                                                                                                                                      {
                                                                                                                                          "columns":  [
                                                                                                                                                          {
                                                                                                                                                              "metadata":  {
                                                                                                                                                                               "dataType":  16,
                                                                                                                                                                               "category":  25,
                                                                                                                                                                               "nameResourceKey":  "iPRangeAddressTypeName",
                                                                                                                                                                               "childSettings":  [
                                                                                                                                                                                                 ],
                                                                                                                                                                               "options":  [
                                                                                                                                                                                               {
                                                                                                                                                                                                   "nameResourceKey":  "notConfigured",
                                                                                                                                                                                                   "enabled":  true
                                                                                                                                                                                               },
                                                                                                                                                                                               {
                                                                                                                                                                                                   "nameResourceKey":  "iPv4Option",
                                                                                                                                                                                                   "value":  "#microsoft.graph.iPv4Range",
                                                                                                                                                                                                   "enabled":  true
                                                                                                                                                                                               },
                                                                                                                                                                                               {
                                                                                                                                                                                                   "nameResourceKey":  "iPv6Option",
                                                                                                                                                                                                   "value":  "#microsoft.graph.iPv6Range",
                                                                                                                                                                                                   "enabled":  true
                                                                                                                                                                                               }
                                                                                                                                                                                           ],
                                                                                                                                                                               "entityKey":  "@odata.type",
                                                                                                                                                                               "booleanActions":  0,
                                                                                                                                                                               "policyType":  58,
                                                                                                                                                                               "enabled":  true
                                                                                                                                                                           }
                                                                                                                                                          },
                                                                                                                                                          {
                                                                                                                                                              "metadata":  {
                                                                                                                                                                               "dataType":  20,
                                                                                                                                                                               "category":  25,
                                                                                                                                                                               "nameResourceKey":  "iPRangeLowerAddressName",
                                                                                                                                                                               "emptyValueResourceKey":  "iPRangeLowerAddressEmptyValue",
                                                                                                                                                                               "childSettings":  [
                                                                                                                                                                                                 ],
                                                                                                                                                                               "options":  [
                                                                                                                                                                                           ],
                                                                                                                                                                               "entityKey":  "lowerAddress",
                                                                                                                                                                               "booleanActions":  0,
                                                                                                                                                                               "policyType":  58,
                                                                                                                                                                               "enabled":  true
                                                                                                                                                                           }
                                                                                                                                                          },
                                                                                                                                                          {
                                                                                                                                                              "metadata":  {
                                                                                                                                                                               "dataType":  20,
                                                                                                                                                                               "category":  25,
                                                                                                                                                                               "nameResourceKey":  "iPRangeUpperAddressName",
                                                                                                                                                                               "emptyValueResourceKey":  "iPRangeUpperAddressEmptyValue",
                                                                                                                                                                               "childSettings":  [
                                                                                                                                                                                                 ],
                                                                                                                                                                               "options":  [
                                                                                                                                                                                           ],
                                                                                                                                                                               "entityKey":  "upperAddress",
                                                                                                                                                                               "booleanActions":  0,
                                                                                                                                                                               "policyType":  58,
                                                                                                                                                                               "enabled":  true
                                                                                                                                                                           }
                                                                                                                                                          }
                                                                                                                                                      ],
                                                                                                                                          "dataType":  21,
                                                                                                                                          "category":  25,
                                                                                                                                          "nameResourceKey":  "contentCachingPeerListenRangesName",
                                                                                                                                          "descriptionResourceKey":  "contentCachingPeerListenRangesDescription",
                                                                                                                                          "childSettings":  [
                                                                                                                                                            ],
                                                                                                                                          "options":  [
                                                                                                                                                      ],
                                                                                                                                          "entityKey":  "contentCachingPeerListenRanges",
                                                                                                                                          "booleanActions":  0,
                                                                                                                                          "policyType":  58,
                                                                                                                                          "enabled":  true
                                                                                                                                      },
                                                                                                                                      {
                                                                                                                                          "columns":  [
                                                                                                                                                          {
                                                                                                                                                              "metadata":  {
                                                                                                                                                                               "dataType":  16,
                                                                                                                                                                               "category":  25,
                                                                                                                                                                               "nameResourceKey":  "iPRangeAddressTypeName",
                                                                                                                                                                               "childSettings":  [
                                                                                                                                                                                                 ],
                                                                                                                                                                               "options":  [
                                                                                                                                                                                               {
                                                                                                                                                                                                   "nameResourceKey":  "notConfigured",
                                                                                                                                                                                                   "enabled":  true
                                                                                                                                                                                               },
                                                                                                                                                                                               {
                                                                                                                                                                                                   "nameResourceKey":  "iPv4Option",
                                                                                                                                                                                                   "value":  "#microsoft.graph.iPv4Range",
                                                                                                                                                                                                   "enabled":  true
                                                                                                                                                                                               },
                                                                                                                                                                                               {
                                                                                                                                                                                                   "nameResourceKey":  "iPv6Option",
                                                                                                                                                                                                   "value":  "#microsoft.graph.iPv6Range",
                                                                                                                                                                                                   "enabled":  true
                                                                                                                                                                                               }
                                                                                                                                                                                           ],
                                                                                                                                                                               "entityKey":  "@odata.type",
                                                                                                                                                                               "booleanActions":  0,
                                                                                                                                                                               "policyType":  58,
                                                                                                                                                                               "enabled":  true
                                                                                                                                                                           }
                                                                                                                                                          },
                                                                                                                                                          {
                                                                                                                                                              "metadata":  {
                                                                                                                                                                               "dataType":  20,
                                                                                                                                                                               "category":  25,
                                                                                                                                                                               "nameResourceKey":  "iPRangeLowerAddressName",
                                                                                                                                                                               "emptyValueResourceKey":  "iPRangeLowerAddressEmptyValue",
                                                                                                                                                                               "childSettings":  [
                                                                                                                                                                                                 ],
                                                                                                                                                                               "options":  [
                                                                                                                                                                                           ],
                                                                                                                                                                               "entityKey":  "lowerAddress",
                                                                                                                                                                               "booleanActions":  0,
                                                                                                                                                                               "policyType":  58,
                                                                                                                                                                               "enabled":  true
                                                                                                                                                                           }
                                                                                                                                                          },
                                                                                                                                                          {
                                                                                                                                                              "metadata":  {
                                                                                                                                                                               "dataType":  20,
                                                                                                                                                                               "category":  25,
                                                                                                                                                                               "nameResourceKey":  "iPRangeUpperAddressName",
                                                                                                                                                                               "emptyValueResourceKey":  "iPRangeUpperAddressEmptyValue",
                                                                                                                                                                               "childSettings":  [
                                                                                                                                                                                                 ],
                                                                                                                                                                               "options":  [
                                                                                                                                                                                           ],
                                                                                                                                                                               "entityKey":  "upperAddress",
                                                                                                                                                                               "booleanActions":  0,
                                                                                                                                                                               "policyType":  58,
                                                                                                                                                                               "enabled":  true
                                                                                                                                                                           }
                                                                                                                                                          }
                                                                                                                                                      ],
                                                                                                                                          "dataType":  21,
                                                                                                                                          "category":  25,
                                                                                                                                          "nameResourceKey":  "contentCachingPeerFilterRangesName",
                                                                                                                                          "descriptionResourceKey":  "contentCachingPeerFilterRangesDescription",
                                                                                                                                          "childSettings":  [
                                                                                                                                                            ],
                                                                                                                                          "options":  [
                                                                                                                                                      ],
                                                                                                                                          "entityKey":  "contentCachingPeerFilterRanges",
                                                                                                                                          "booleanActions":  0,
                                                                                                                                          "policyType":  58,
                                                                                                                                          "enabled":  true
                                                                                                                                      }
                                                                                                                                  ],
                                                                                                                     "enabled":  true
                                                                                                                 }
                                                                                                             ],
                                                                                                 "entityKey":  "contentCachingPeerPolicy",
                                                                                                 "booleanActions":  0,
                                                                                                 "defaultValue":  "notConfigured",
                                                                                                 "policyType":  58,
                                                                                                 "enabled":  true
                                                                                             },
                                                                                             {
                                                                                                 "columns":  [
                                                                                                                 {
                                                                                                                     "metadata":  {
                                                                                                                                      "dataType":  20,
                                                                                                                                      "category":  25,
                                                                                                                                      "nameResourceKey":  "contentCachingParentsName",
                                                                                                                                      "childSettings":  [
                                                                                                                                                        ],
                                                                                                                                      "options":  [
                                                                                                                                                  ],
                                                                                                                                      "entityKey":  "contentCachingParents",
                                                                                                                                      "booleanActions":  0,
                                                                                                                                      "policyType":  58,
                                                                                                                                      "enabled":  true
                                                                                                                                  }
                                                                                                                 }
                                                                                                             ],
                                                                                                 "dataType":  21,
                                                                                                 "category":  25,
                                                                                                 "nameResourceKey":  "contentCachingParentsName",
                                                                                                 "descriptionResourceKey":  "contentCachingParentsDescription",
                                                                                                 "childSettings":  [
                                                                                                                   ],
                                                                                                 "options":  [
                                                                                                             ],
                                                                                                 "entityKey":  "contentCachingParents",
                                                                                                 "booleanActions":  0,
                                                                                                 "policyType":  58,
                                                                                                 "enabled":  true
                                                                                             },
                                                                                             {
                                                                                                 "dataType":  16,
                                                                                                 "category":  25,
                                                                                                 "nameResourceKey":  "contentCachingParentSelectionPolicyName",
                                                                                                 "descriptionResourceKey":  "contentCachingParentSelectionPolicyDescription",
                                                                                                 "childSettings":  [
                                                                                                                   ],
                                                                                                 "options":  [
                                                                                                                 {
                                                                                                                     "nameResourceKey":  "notConfigured",
                                                                                                                     "value":  "notConfigured",
                                                                                                                     "enabled":  true
                                                                                                                 },
                                                                                                                 {
                                                                                                                     "nameResourceKey":  "roundRobinOption",
                                                                                                                     "value":  "roundRobin",
                                                                                                                     "enabled":  true
                                                                                                                 },
                                                                                                                 {
                                                                                                                     "nameResourceKey":  "firstAvailableOption",
                                                                                                                     "value":  "firstAvailable",
                                                                                                                     "enabled":  true
                                                                                                                 },
                                                                                                                 {
                                                                                                                     "nameResourceKey":  "urlPathHashOption",
                                                                                                                     "value":  "urlPathHash",
                                                                                                                     "enabled":  true
                                                                                                                 },
                                                                                                                 {
                                                                                                                     "nameResourceKey":  "randomOption",
                                                                                                                     "value":  "random",
                                                                                                                     "enabled":  true
                                                                                                                 },
                                                                                                                 {
                                                                                                                     "nameResourceKey":  "stickyAvailableOption",
                                                                                                                     "value":  "stickyAvailable",
                                                                                                                     "enabled":  true
                                                                                                                 }
                                                                                                             ],
                                                                                                 "entityKey":  "contentCachingParentSelectionPolicy",
                                                                                                 "booleanActions":  0,
                                                                                                 "defaultValue":  "notConfigured",
                                                                                                 "policyType":  58,
                                                                                                 "enabled":  true
                                                                                             }
                                                                                         ],
                                                                       "options":  [
                                                                                   ],
                                                                       "entityKey":  "contentCachingEnabled",
                                                                       "booleanActions":  9,
                                                                       "policyType":  58,
                                                                       "enabled":  true
                                                                   }
                                                               ],
                                             "options":  [
                                                         ],
                                             "booleanActions":  0,
                                             "policyType":  58,
                                             "enabled":  true
                                         }
 }
--- a/Documentation/ObjectInfo/controlpanelandsettings_windows10general.json
+++ b/Documentation/ObjectInfo/controlpanelandsettings_windows10general.json
@@ -1,271 +0,0 @@
 {
    "controlpanelandsettings_windows10general":  {
                                                     "dataType":  0,
                                                     "category":  26,
                                                     "nameResourceKey":  "settingsAppName",
                                                     "descriptionResourceKey":  "settingsAppDescription",
                                                     "childSettings":  [
                                                                           {
                                                                               "dataType":  0,
                                                                               "category":  26,
                                                                               "nameResourceKey":  "systemPageName",
                                                                               "descriptionResourceKey":  "systemPageDescription",
                                                                               "childSettings":  [
                                                                                                     {
                                                                                                         "dataType":  0,
                                                                                                         "category":  26,
                                                                                                         "nameResourceKey":  "settingsBlockChangePowerSleepName",
                                                                                                         "descriptionResourceKey":  "settingsBlockChangePowerSleepDesc",
                                                                                                         "childSettings":  [
                                                                                                                           ],
                                                                                                         "options":  [
                                                                                                                     ],
                                                                                                         "entityKey":  "settingsBlockChangePowerSleep",
                                                                                                         "booleanActions":  3,
                                                                                                         "defaultValue":  false,
                                                                                                         "policyType":  79,
                                                                                                         "enabled":  true
                                                                                                     }
                                                                                                 ],
                                                                               "options":  [
                                                                                           ],
                                                                               "entityKey":  "settingsBlockSystemPage",
                                                                               "booleanActions":  3,
                                                                               "defaultValue":  false,
                                                                               "policyType":  79,
                                                                               "enabled":  true
                                                                           },
                                                                           {
                                                                               "dataType":  0,
                                                                               "category":  26,
                                                                               "nameResourceKey":  "devicesPageName",
                                                                               "descriptionResourceKey":  "devicesPageDescription",
                                                                               "childSettings":  [
                                                                                                 ],
                                                                               "options":  [
                                                                                           ],
                                                                               "entityKey":  "settingsBlockDevicesPage",
                                                                               "booleanActions":  3,
                                                                               "defaultValue":  false,
                                                                               "policyType":  79,
                                                                               "enabled":  true
                                                                           },
                                                                           {
                                                                               "dataType":  0,
                                                                               "category":  26,
                                                                               "nameResourceKey":  "networkAndInternetPageName",
                                                                               "descriptionResourceKey":  "networkAndInternetPageDescription",
                                                                               "childSettings":  [
                                                                                                 ],
                                                                               "options":  [
                                                                                           ],
                                                                               "entityKey":  "settingsBlockNetworkInternetPage",
                                                                               "booleanActions":  3,
                                                                               "defaultValue":  false,
                                                                               "policyType":  79,
                                                                               "enabled":  true
                                                                           },
                                                                           {
                                                                               "dataType":  0,
                                                                               "category":  26,
                                                                               "nameResourceKey":  "personalizationPageName",
                                                                               "descriptionResourceKey":  "personalizationPageDescription",
                                                                               "childSettings":  [
                                                                                                 ],
                                                                               "options":  [
                                                                                           ],
                                                                               "entityKey":  "settingsBlockPersonalizationPage",
                                                                               "booleanActions":  3,
                                                                               "defaultValue":  false,
                                                                               "policyType":  79,
                                                                               "enabled":  true
                                                                           },
                                                                           {
                                                                               "dataType":  0,
                                                                               "category":  26,
                                                                               "nameResourceKey":  "appsPageName",
                                                                               "descriptionResourceKey":  "appsPageDescription",
                                                                               "childSettings":  [
                                                                                                 ],
                                                                               "options":  [
                                                                                           ],
                                                                               "entityKey":  "settingsBlockAppsPage",
                                                                               "booleanActions":  3,
                                                                               "defaultValue":  false,
                                                                               "policyType":  79,
                                                                               "enabled":  true
                                                                           },
                                                                           {
                                                                               "dataType":  0,
                                                                               "category":  26,
                                                                               "nameResourceKey":  "accountsPageName",
                                                                               "descriptionResourceKey":  "accountsPageDescription",
                                                                               "childSettings":  [
                                                                                                 ],
                                                                               "options":  [
                                                                                           ],
                                                                               "entityKey":  "settingsBlockAccountsPage",
                                                                               "booleanActions":  3,
                                                                               "defaultValue":  false,
                                                                               "policyType":  79,
                                                                               "enabled":  true
                                                                           },
                                                                           {
                                                                               "dataType":  0,
                                                                               "category":  26,
                                                                               "nameResourceKey":  "timeAndLanguagePageName",
                                                                               "descriptionResourceKey":  "timeAndLanguagePageDescription",
                                                                               "childSettings":  [
                                                                                                     {
                                                                                                         "dataType":  0,
                                                                                                         "category":  26,
                                                                                                         "nameResourceKey":  "settingsBlockChangeSystemTimeName",
                                                                                                         "descriptionResourceKey":  "settingsBlockChangeSystemTimeDesc",
                                                                                                         "childSettings":  [
                                                                                                                           ],
                                                                                                         "options":  [
                                                                                                                     ],
                                                                                                         "entityKey":  "settingsBlockChangeSystemTime",
                                                                                                         "booleanActions":  3,
                                                                                                         "defaultValue":  false,
                                                                                                         "policyType":  79,
                                                                                                         "enabled":  true
                                                                                                     },
                                                                                                     {
                                                                                                         "dataType":  0,
                                                                                                         "category":  26,
                                                                                                         "nameResourceKey":  "settingsBlockChangeRegionName",
                                                                                                         "descriptionResourceKey":  "settingsBlockChangeRegionDesc",
                                                                                                         "childSettings":  [
                                                                                                                           ],
                                                                                                         "options":  [
                                                                                                                     ],
                                                                                                         "entityKey":  "settingsBlockChangeRegion",
                                                                                                         "booleanActions":  3,
                                                                                                         "defaultValue":  false,
                                                                                                         "policyType":  79,
                                                                                                         "enabled":  true
                                                                                                     },
                                                                                                     {
                                                                                                         "dataType":  0,
                                                                                                         "category":  26,
                                                                                                         "nameResourceKey":  "settingsBlockChangeLanguageName",
                                                                                                         "descriptionResourceKey":  "settingsBlockChangeLanguageDesc",
                                                                                                         "childSettings":  [
                                                                                                                           ],
                                                                                                         "options":  [
                                                                                                                     ],
                                                                                                         "entityKey":  "settingsBlockChangeLanguage",
                                                                                                         "booleanActions":  3,
                                                                                                         "defaultValue":  false,
                                                                                                         "policyType":  79,
                                                                                                         "enabled":  true
                                                                                                     }
                                                                                                 ],
                                                                               "options":  [
                                                                                           ],
                                                                               "entityKey":  "settingsBlockTimeLanguagePage",
                                                                               "booleanActions":  3,
                                                                               "defaultValue":  false,
                                                                               "policyType":  79,
                                                                               "enabled":  true
                                                                           },
                                                                           {
                                                                               "dataType":  0,
                                                                               "category":  26,
                                                                               "nameResourceKey":  "gamingPageName",
                                                                               "descriptionResourceKey":  "gamingPageDescription",
                                                                               "childSettings":  [
                                                                                                 ],
                                                                               "options":  [
                                                                                           ],
                                                                               "entityKey":  "settingsBlockGamingPage",
                                                                               "booleanActions":  3,
                                                                               "defaultValue":  false,
                                                                               "policyType":  79,
                                                                               "enabled":  true
                                                                           },
                                                                           {
                                                                               "dataType":  0,
                                                                               "category":  26,
                                                                               "nameResourceKey":  "easeOfAccessPageName",
                                                                               "descriptionResourceKey":  "easeOfAccessPageDescription",
                                                                               "childSettings":  [
                                                                                                 ],
                                                                               "options":  [
                                                                                           ],
                                                                               "entityKey":  "settingsBlockEaseOfAccessPage",
                                                                               "booleanActions":  3,
                                                                               "defaultValue":  false,
                                                                               "policyType":  79,
                                                                               "enabled":  true
                                                                           },
                                                                           {
                                                                               "dataType":  0,
                                                                               "category":  26,
                                                                               "nameResourceKey":  "privacyPageName",
                                                                               "descriptionResourceKey":  "privacyPageDescription",
                                                                               "childSettings":  [
                                                                                                 ],
                                                                               "options":  [
                                                                                           ],
                                                                               "entityKey":  "settingsBlockPrivacyPage",
                                                                               "booleanActions":  3,
                                                                               "defaultValue":  false,
                                                                               "policyType":  79,
                                                                               "enabled":  true
                                                                           },
                                                                           {
                                                                               "dataType":  0,
                                                                               "category":  26,
                                                                               "nameResourceKey":  "updateAndSecurityPageName",
                                                                               "descriptionResourceKey":  "updateAndSecurityPageDescription",
                                                                               "childSettings":  [
                                                                                                 ],
                                                                               "options":  [
                                                                                           ],
                                                                               "entityKey":  "settingsBlockUpdateSecurityPage",
                                                                               "booleanActions":  3,
                                                                               "defaultValue":  false,
                                                                               "policyType":  79,
                                                                               "enabled":  true
                                                                           }
                                                                       ],
                                                     "options":  [
                                                                 ],
                                                     "entityKey":  "settingsBlockSettingsApp",
                                                     "booleanActions":  3,
                                                     "defaultValue":  false,
                                                     "policyType":  79,
                                                     "enabled":  true
                                                 }
 }
--- a/Documentation/ObjectInfo/credentialguard_windows10endpointprotection.json
+++ b/Documentation/ObjectInfo/credentialguard_windows10endpointprotection.json
@@ -1,39 +0,0 @@
 {
    "credentialguard_windows10endpointprotection":  {
                                                        "dataType":  16,
                                                        "category":  27,
                                                        "nameResourceKey":  "deviceGuardCredentialGuardName",
                                                        "descriptionResourceKey":  "deviceGuardCredentialGuardDescription",
                                                        "childSettings":  [
                                                                          ],
                                                        "options":  [
                                                                        {
                                                                            "nameResourceKey":  "notConfigured",
                                                                            "value":  "notConfigured",
                                                                            "enabled":  true
                                                                        },
                                                                        {
                                                                            "nameResourceKey":  "disableOption",
                                                                            "value":  "disable",
                                                                            "enabled":  true
                                                                        },
                                                                        {
                                                                            "nameResourceKey":  "enableWithUEFILock",
                                                                            "value":  "enableWithUEFILock",
                                                                            "enabled":  true
                                                                        },
                                                                        {
                                                                            "nameResourceKey":  "enableWithoutUEFILock",
                                                                            "value":  "enableWithoutUEFILock",
                                                                            "enabled":  true
                                                                        }
                                                                    ],
                                                        "entityKey":  "deviceGuardLocalSystemAuthorityCredentialGuardSettings",
                                                        "booleanActions":  0,
                                                        "defaultValue":  "notConfigured",
                                                        "unconfiguredValue":  "notConfigured",
                                                        "policyType":  77,
                                                        "enabled":  true
                                                    }
 }
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Tomas Kracmar	70679cba48	v4.0.1: per-user app naming, auth deletion, TUI onboarding flow, PIM docs	2026-04-16 15:40:33 +02:00
Tomas Kracmar	1ff059342f	chore: bump VERSION to 4.0.1	2026-04-16 11:36:09 +02:00
Tomas Kracmar	ab6817f59b	feat(ui): detect missing fzf and show installation hints	2026-04-16 11:34:03 +02:00
Tomas Kracmar	15210313cd	chore: clean ignored cache, refresh README, add VERSION 4.0.0	2026-04-16 11:02:54 +02:00
Tomas Kracmar	18fc5190d8	feat(launcher): add 'Refresh tenant names' menu option - Menu entry 13 re-queries Graph /organization for every saved tenant - Updates cached TenantName values in Settings.json - Refreshes the active tenant display in the menu header	2026-04-14 19:51:16 +02:00
Tomas Kracmar	e8ad3f6b96	feat(launcher): tenant picker with name resolution in TUI - Start-IntuneToolkit.ps1 now shows a tenant picker as the first step when -TenantId is not provided. - Lists saved tenants from Settings.json, attempting to display cached tenant names alongside GUIDs. - Offers '[+ Onboard new tenant]' option for entering new tenants. - Automatically resolves unknown tenant names via Graph /organization and caches them back to Settings.json for future use.	2026-04-14 19:43:54 +02:00
Tomas Kracmar	6703625c00	fix(rename): guard Add prefix against double-prefixing Skip objects whose displayName or description already starts with the requested prefix. This makes Add prefix idempotent.	2026-04-14 19:02:06 +02:00
Tomas Kracmar	cd1c004f4b	fix(rename): add retry logic for transient 5xx/429 errors Settings Catalog and other Graph endpoints occasionally return 500 InternalServerError on PATCH. Retry up to 3 times with a 2s delay to improve reliability for bulk rename operations.	2026-04-14 18:58:20 +02:00
Tomas Kracmar	07c25e897a	fix(assignments): use bulk /assign endpoint for removals on all types Settings Catalog and other bulk-assign types do not support DELETE on individual assignments. Removal now reloads existing assignments, filters out selected targets, sanitizes remaining payloads, and re-POSTs to <API>/<id>/assign. This mirrors the add flow and works universally across all supported object types.	2026-04-14 18:50:02 +02:00
Tomas Kracmar	814c1d116c	fix(tui): remove space:toggle binding from fzf to allow searching with spaces --bind=space:toggle prevented typing spaces in search queries. fzf --multi already supports Tab for selection by default.	2026-04-14 18:44:54 +02:00
Tomas Kracmar	33e1118cc6	fix: restore .value access when using -AllPages on group queries Invoke-GraphRequest with -AllPages returns the full response object with accumulated items in .value, not a flat array.	2026-04-14 18:39:50 +02:00
Tomas Kracmar	77f7372d44	fix: fetch all groups via -AllPages for large tenants Replaces default 100-item page limits and =999 workarounds with -AllPages on group queries across assignment and baseline scripts. Enables full fzf inline search/filter for group selection.	2026-04-14 18:36:23 +02:00
Tomas Kracmar	773ab12901	fix(launcher): strip unsupported auth params when calling Initialize-IntuneAuth	2026-04-14 18:27:40 +02:00
Tomas Kracmar	68a5af1af3	chore: ignore GraphMetaData.xml and CloudAPIPowerShellManagement cache files	2026-04-14 15:12:52 +02:00
Tomas Kracmar	e13d14edcb	feat(toolkit): complete macOS Intune Toolkit v1 Core enhancements: - Expanded default export/import scope to ~45 object types including DeviceManagementIntents - Added -AllPages pagination support across Graph queries for large tenants - Invoke-GraphRequest now throws on 4xx/5xx instead of silently returning null - Added macOS Keychain fallback for secret retrieval in headless auth flow - Added NameSearchPattern/NameReplacePattern mutation support through export/import forms New toolkit scripts: - Bulk-AppAssignment.ps1: bulk-assign apps to groups/All Users/All Devices - Bulk-AssignmentManager.ps1: add/remove assignments for any policy type with correct @odata.type - Backup-Restore-Assignments.ps1: JSON backup with cross-tenant group resolution - Export-AssignmentsToCsv.ps1: CSV/Markdown documentation output - Bulk-RenamePolicies.ps1: regex search/replace and prefix mutations - Bulk-DeviceOperations.ps1: delete/retire/wipe/lock/sync with -WhatIf safeguards - Start-IntuneManagementTui.ps1: interactive terminal UI for headless operations - Create-IntuneManagementApp.ps1: helper for app registration setup Updated existing scripts: - Export-Policies.ps1 / Import-Policies.ps1: wired mutation params through - Start-HeadlessIntune.ps1: integrated TUI and new parameter forwarding	2026-04-14 15:11:09 +02:00
Tomas Kracmar	0ddd21ab14	feat(launcher): add baseline deployer to unified menu - Adds 'Deploy baseline' and 'Deploy baseline (dry-run / WhatIf)' to Start-IntuneToolkit.ps1 - Ensures WhatIf flag is cleared between menu iterations	2026-04-14 15:05:15 +02:00
Tomas Kracmar	c4b8f4aaf6	feat(baseline): declarative Intune baseline deployer - Add Deploy-IntuneBaseline.ps1 for YAML-driven policy + assignment deployment - Add ConvertTo-IntuneBaseline.ps1 to convert export folders to baseline manifests - Add example OpenIntuneBaseline YAML in Baselines/ - Supports mutations, group auto-creation, idempotency, and WhatIf mode	2026-04-14 14:59:29 +02:00
Tomas Kracmar	87b7af25a7	feat(auth): sync full Graph permission set and patch existing apps - Unified required Microsoft Graph app roles in Initialize-IntuneAuth.ps1 - Added permission patching for existing app registrations - Logs the change and operations for audit	2026-04-14 12:15:14 +02:00
Tomas Kracmar	9dace83cff	Make browser auth app id optional	2026-04-08 19:10:45 +02:00
Tomas Kracmar	239e3ec16e	Add browser auth for headless runs	2026-04-08 16:09:30 +02:00
Tomas Kracmar	c803a00df7	Strip legacy UI and keep headless runtime	2026-04-08 15:35:04 +02:00