From ba3bc0c4f79abd524cded14b17834601f2da202b Mon Sep 17 00:00:00 2001
From: knovichenko <162521447+knovichenko@users.noreply.github.com>
Date: Thu, 3 Apr 2025 10:00:52 -0700
Subject: [PATCH 01/24] Update Get-VivaModuleFeaturePolicy.md

Removing Category-related instructions.
---
 .../exchange/Get-VivaModuleFeaturePolicy.md   | 58 ++-----------------
 1 file changed, 5 insertions(+), 53 deletions(-)

diff --git a/exchange/exchange-ps/exchange/Get-VivaModuleFeaturePolicy.md b/exchange/exchange-ps/exchange/Get-VivaModuleFeaturePolicy.md
index 8d03457b9e..79cf7fc362 100644
--- a/exchange/exchange-ps/exchange/Get-VivaModuleFeaturePolicy.md
+++ b/exchange/exchange-ps/exchange/Get-VivaModuleFeaturePolicy.md
@@ -15,9 +15,7 @@ ms.reviewer:
 ## SYNOPSIS
 This cmdlet is available only in the Exchange Online PowerShell module v3.2.0 or later. For more information, see [About the Exchange Online PowerShell module](https://aka.ms/exov3-module).
 
-**Note**: Support for categories is available in version 3.5.0-Preview2 or later of the module, but no categories are currently available in Viva. We'll update the documentation when categories are available.
-
-Use the Get-VivaModuleFeaturePolicy cmdlet to view the access policies for a specified feature in a Viva module or category in Viva. Policies are used to restrict or grant access to the specified feature or category for specific users, groups, or the entire tenant. This cmdlet provides details about the policies, including the policy's identifier, name, and creation date.
+Use the Get-VivaModuleFeaturePolicy cmdlet to view the access policies for a specified feature in a Viva module in Viva. Policies are used to restrict or grant access to the specified feature for specific users, groups, or the entire tenant. This cmdlet provides details about the policies, including the policy's identifier, name, and creation date.
 
 For information about the parameter sets in the Syntax section below, see [Exchange cmdlet syntax](https://learn.microsoft.com/powershell/exchange/exchange-cmdlet-syntax).
 
@@ -31,20 +29,10 @@ Get-VivaModuleFeaturePolicy -FeatureId <String> -ModuleId <String>
  [<CommonParameters>]
 ```
 
-### CategoryPolicy
-```
-Get-VivaModuleFeaturePolicy -CategoryId <String>
- [[-PolicyId] <String>]
- [-ResultSize <Unlimited>]
- [<CommonParameters>]
-```
-
 ## DESCRIPTION
-Use the Get-VivaModuleFeaturePolicy cmdlet to view the access policies for a specified feature in a Viva module or a category in Viva.
-
-Support for categories is available in version 3.5.0-Preview2 or later of the module.
+Use the Get-VivaModuleFeaturePolicy cmdlet to view the access policies for a specified feature in a Viva module in Viva.
 
-You can view all policies for a specified feature in a Viva module or a category in Viva. To view a specific policy, you can include the PolicyId parameter.
+You can view all policies for a specified feature in a Viva module in Viva. To view a specific policy, you can include the PolicyId parameter.
 
 You need to use the Connect-ExchangeOnline cmdlet to authenticate.
 
@@ -75,44 +63,8 @@ Get-VivaModuleFeaturePolicy -ModuleId VivaInsights -FeatureId Reflection -Policy
 
 This example returns details about a specific policy added for the Reflection feature in Viva Insights.
 
-### Example 3
-```powershell
-Get-VivaModuleFeaturePolicy -CategoryId <category_id>
-```
-
-This example returns details about all the policies added for the `<category_id>` category in Viva.
-
-### Example 4
-```powershell
-Get-VivaModuleFeaturePolicy -CategoryId <category_id> -PolicyId 3db38dfa-02a3-4039-b33a-42b0b3da029b
-```
-
-This example returns details about a specific policy added for the `<category_id>` category in Viva.
-
 ## PARAMETERS
 
-### -CategoryId
-This parameter is available in version 3.5.0-Preview2 or later of the module.
-
-**Note**: Currently, no categories are available in Viva. We'll update the documentation when categories are available.
-
-The CategoryId parameter specifies the category that you want to view the policies for.
-
-To view details about the categories in Viva that support feature access controls, refer to the Get-VivaFeatureCategory cmdlet. The details provided by the Get-VivaFeatureCategory cmdlet include the category identifier.
-
-```yaml
-Type: String
-Parameter Sets: CategoryPolicy
-Aliases:
-Applicable: Exchange Online
-
-Required: True
-Position: Named
-Default value: None
-Accept pipeline input: False
-Accept wildcard characters: False
-```
-
 ### -FeatureId
 The FeatureId parameter specifies the feature in the Viva module that you want to view the policies for.
 
@@ -148,9 +100,9 @@ Accept wildcard characters: False
 ```
 
 ### -PolicyId
-The PolicyId parameter specifies the specific policy for the feature in the Viva module or the category that you want to view.
+The PolicyId parameter specifies the specific policy for the feature in the Viva module that you want to view.
 
-To view details about all policies for a feature in a Viva module or a category, run this cmdlet without the PolicyId parameter. These details include the identifiers of all the policies for a feature in a Viva module or a category.
+To view details about all policies for a feature in a Viva module, run this cmdlet without the PolicyId parameter. These details include the identifiers of all the policies for a feature in a Viva module.
 
 ```yaml
 Type: String

From 5be775238525337d571277f4d911611aeb8b8bd3 Mon Sep 17 00:00:00 2001
From: knovichenko <162521447+knovichenko@users.noreply.github.com>
Date: Thu, 3 Apr 2025 10:07:03 -0700
Subject: [PATCH 02/24] Update Update-VivaModuleFeaturePolicy.md

Removing Category-related documents.
---
 .../Update-VivaModuleFeaturePolicy.md         | 105 +-----------------
 1 file changed, 5 insertions(+), 100 deletions(-)

diff --git a/exchange/exchange-ps/exchange/Update-VivaModuleFeaturePolicy.md b/exchange/exchange-ps/exchange/Update-VivaModuleFeaturePolicy.md
index 9d677d3db1..1970be93e2 100644
--- a/exchange/exchange-ps/exchange/Update-VivaModuleFeaturePolicy.md
+++ b/exchange/exchange-ps/exchange/Update-VivaModuleFeaturePolicy.md
@@ -15,13 +15,10 @@ ms.reviewer:
 ## SYNOPSIS
 This cmdlet is available only in the Exchange Online PowerShell module v3.2.0 or later. For more information, see [About the Exchange Online PowerShell module](https://aka.ms/exov3-module).
 
-**Note**: Support for categories is available in version 3.5.0-Preview2 or later of the module, but no categories are currently available in Viva. We'll update the documentation when categories are available.
-
-Use the Update-VivaModuleFeaturePolicy cmdlet to update an access policy for a feature in a Viva module or a category in Viva.
+Use the Update-VivaModuleFeaturePolicy cmdlet to update an access policy for a feature in a Viva module in Viva.
 
 - You can't update a policy for a particular user or group to include the entire tenant if a policy for the entire tenant already exists for the feature. Only one tenant-wide policy is supported.
-- Policies assigned to a specific user or group take priority over the policy assigned to the entire tenant when determining whether a feature/category is enabled. If a user has multiple policies assigned for a feature/category (directly as a user or member of a group), the most restrictive policy applies.
-- You can only update user controls at the feature policy level, not the category policy level.
+- Policies assigned to a specific user or group take priority over the policy assigned to the entire tenant when determining whether a feature is enabled. If a user has multiple policies assigned for a feature (directly as a user or member of a group), the most restrictive policy applies.
 - Some features only support policies that apply to the entire tenant, not specific users or groups. You can refer to supported policy scopes for a feature using the [Get-VivaModuleFeature](https://learn.microsoft.com/powershell/module/exchange/get-vivamodulefeature) cmdlet.
 
 Some features include the option for user controls (user opt out). Refer to the feature documentation to see if user controls are available for the feature that you intend to set a policy for.
@@ -45,33 +42,17 @@ Update-VivaModuleFeaturePolicy -FeatureId <String> -ModuleId <String> -PolicyId
  [<CommonParameters>]
 ```
 
-### CategoryPolicy
-```
-Update-VivaModuleFeaturePolicy> -CategoryId <String> -PolicyId <String>
- [-Confirm]
- [-Everyone <Boolean]
- [-IsCategoryEnabled <Boolean>]
- [-GroupIds <String[]>]
- [-Name <String>]
- [-ResultSize <Unlimited>]
- [-UserIds <String[]>]
- [-WhatIf]
- [<CommonParameters>]
-```
-
 ## DESCRIPTION
-Use the Update-VivaModuleFeaturePolicy cmdlet to update an access policy for a feature in a Viva module or a category in Viva.
-
-Support for categories is available in version 3.5.0-Preview2 or later of the module.
+Use the Update-VivaModuleFeaturePolicy cmdlet to update an access policy for a feature in a Viva module in Viva.
 
 This cmdlet updates the attributes of the policy that you specify. These attributes include:
 
 - The policy name (Name parameter).
-- Whether or not the policy enables the feature (IsFeatureEnabled parameter) or the category (IsCategoryEnabled parameter).
+- Whether or not the policy enables the feature (IsFeatureEnabled parameter).
 - Whether or not the policy enables user controls (IsUserControlEnabled parameter, only applicable to a feature policy).
 - Who the policy applies to (the UserIds and GroupIds parameters or the Everyone parameter).
 
-You can update these attributes independently of each other. For example, if you specify the Name parameter but not the IsFeatureEnabled/IsCategoryEnabled parameter, the name of the policy is updated but whether or not the policy enables the feature/category remains unchanged.
+You can update these attributes independently of each other. For example, if you specify the Name parameter but not the IsFeatureEnabled parameter, the name of the policy is updated but whether or not the policy enables the feature remains unchanged.
 
 **Important**: Values that you specify for the UserIds and/or GroupIds parameters or the Everyone parameter **overwrite** any existing users or groups. To preserve the existing users and groups, you need to specify those existing users or groups **and** any additional users or groups that you want to add. Not including existing users or groups in the command effectively removes those specific users or groups from the policy. For more information, see the examples.
 
@@ -118,58 +99,8 @@ Update-VivaModuleFeaturePolicy -ModuleId VivaInsights -FeatureId Reflection -Pol
 
 This example updates the name of the specified policy, makes it so the policy enables the feature, and updates who the policy applies to. The policy now applies **only** to the specified users and groups, overwriting the users and groups the policy used to apply to.
 
-### Example 5
-```powershell
-Update-VivaModuleFeaturePolicy -CategoryId <category_id> -PolicyId 3db38dfa-02a3-4039-b33a-42b0b3da029b -Name NewPolicyName -IsCategoryEnabled $false
-```
-
-This example updates the name of the specified policy and makes it so the policy does not enable the category (effectively all features under the category).
-
-### Example 6
-```powershell
-Update-VivaModuleFeaturePolicy -CategoryId <category_id> -PolicyId 3db38dfa-02a3-4039-b33a-42b0b3da029b -GroupIds group1@contoso.com,group2@contoso.com,57680382-61a5-4378-85ad-f72095d4e9c3
-```
-
-This example updates who the specified policy applies to. The policy now applies **only** to the specified groups, overwriting the users and groups the policy used to apply to.
-
-### Example 7
-```powershell
-Update-VivaModuleFeaturePolicy -CategoryId <category_id> -PolicyId 3db38dfa-02a3-4039-b33a-42b0b3da029b -UserIds user1@contoso.com,user2@contoso.com
-```
-
-This example updates who the specified policy applies to. The policy now applies **only** to the specified users, overwriting the users and groups the policy used to apply to.
-
-### Example 8
-```powershell
-Update-VivaModuleFeaturePolicy -CategoryId <category_id> -PolicyId 3db38dfa-02a3-4039-b33a-42b0b3da029b -Name NewPolicyName -IsCategoryEnabled $true -GroupIds group1@contoso.com,57680382-61a5-4378-85ad-f72095d4e9c3 -UserIds user1@contoso.com
-```
-
-This example updates the name of the specified policy, makes it so the policy enables the category (effectively all features under the category), and updates who the policy applies to. The policy now applies **only** to the specified users and groups, overwriting the users and groups the policy used to apply to.
-
 ## PARAMETERS
 
-### -CategoryId
-This parameter is available in version 3.5.0-Preview2 or later of the module.
-
-**Note**: Currently, no categories are available in Viva. We'll update the documentation when categories are available.
-
-The CategoryId parameter specifies the category of the policy that you want to update.
-
-To view details about the categories that support feature access controls, use the Get-FeatureCategory cmdlet. The CategoryId value is returned in the output of the cmdlet.
-
-```yaml
-Type: String
-Parameter Sets: CategoryPolicy
-Aliases:
-Applicable: Exchange Online
-
-Required: True
-Position: Named
-Default value: None
-Accept pipeline input: False
-Accept wildcard characters: False
-```
-
 ### -FeatureId
 The FeatureId parameter specifies the feature in the Viva module of the policy that you want to update.
 
@@ -289,32 +220,6 @@ Default value: None
 Accept pipeline input: False
 Accept wildcard characters: False
 ```
-
-### -IsCategoryEnabled
-This parameter is available in version 3.5.0-Preview2 or later of the module.
-
-**Note**: Currently, no categories are available in Viva. We'll update the documentation when categories are available.
-
-The IsCategoryEnabled parameter specifies whether the category is enabled by the updated policy. Valid values are:
-
-- $true: The category (effectively all features under the category) is enabled by the policy.
-- $false: The category (effectively all features under the category) is not enabled by the policy.
-
-If you don't want to update whether the category is enabled by the policy, don't use this parameter.
-
-```yaml
-Type: Boolean
-Parameter Sets: CategoryPolicy
-Aliases:
-Applicable: Exchange Online
-
-Required: False
-Position: Named
-Default value: None
-Accept pipeline input: False
-Accept wildcard characters: False
-```
-
 ### -IsFeatureEnabled
 The IsFeatureEnabled parameter specifies whether the feature is enabled by the updated policy. Valid values are:
 

From 53b045d31c27196a336519026a768c9a06b25b07 Mon Sep 17 00:00:00 2001
From: knovichenko <162521447+knovichenko@users.noreply.github.com>
Date: Thu, 3 Apr 2025 10:40:04 -0700
Subject: [PATCH 03/24] Update Add-VivaModuleFeaturePolicy.md

Removed category-related documentation. Added a new parameter -IsUserOptedInByDefault. Added an example of using the new parameter to create a Soft Disable policy.
---
 .../exchange/Add-VivaModuleFeaturePolicy.md   | 124 ++++--------------
 1 file changed, 29 insertions(+), 95 deletions(-)

diff --git a/exchange/exchange-ps/exchange/Add-VivaModuleFeaturePolicy.md b/exchange/exchange-ps/exchange/Add-VivaModuleFeaturePolicy.md
index fab2b15e16..b2f902e2b7 100644
--- a/exchange/exchange-ps/exchange/Add-VivaModuleFeaturePolicy.md
+++ b/exchange/exchange-ps/exchange/Add-VivaModuleFeaturePolicy.md
@@ -15,14 +15,10 @@ ms.reviewer:
 ## SYNOPSIS
 This cmdlet is available only in the Exchange Online PowerShell module v3.2.0 or later. For more information, see [About the Exchange Online PowerShell module](https://aka.ms/exov3-module).
 
-**Note**: Support for categories is available in version 3.5.0-Preview2 or later of the module, but no categories are currently available in Viva. We'll update the documentation when categories are available.
+Use the Add-VivaModuleFeaturePolicy cmdlet to add a new access policy for a specific feature in Viva. The attributes of the policy are defined using the cmdlet parameters. Policies are used to restrict or grant access to the specified feature for specific users, groups, or the entire tenant.
 
-Use the Add-VivaModuleFeaturePolicy cmdlet to add a new access policy for a specific feature or a category in Viva. The attributes of the policy are defined using the cmdlet parameters. Policies are used to restrict or grant access to the specified feature or category for specific users, groups, or the entire tenant.
-
-- You can assign up to 10 policies per feature/category. An additional one policy per feature/category can be assigned to the entire tenant.
-- Policies assigned to a specific user or group take priority over the policy assigned to the entire tenant when determining whether a feature/category is enabled. If a user has multiple policies assigned for a feature/category (directly as a user or member of a group), the most restrictive policy applies.
-- If a category is disabled by category policies, all features under the category are disabled regardless of the policies set at the feature level.
-- You can only update user controls at the feature policy level, not the category policy level.
+- You can assign up to 10 policies per feature. An additional one policy per feature can be assigned to the entire tenant.
+- Policies assigned to a specific user or group take priority over the policy assigned to the entire tenant when determining whether a feature is enabled. If a user has multiple policies assigned for a feature (directly as a user or member of a group), the most restrictive policy applies.
 - Some features only support policies that apply to the entire tenant, not specific users or groups. You can refer to supported policy scopes for a feature using the [Get-VivaModuleFeature](https://learn.microsoft.com/powershell/module/exchange/get-vivamodulefeature) cmdlet.
 
 Some features include the option for user controls (user opt out). Refer to the feature documentation to see if user controls are available for the feature that you intend to set a policy for.
@@ -44,22 +40,8 @@ Add-VivaModuleFeaturePolicy -FeatureId <String> -IsFeatureEnabled <Boolean> -Mod
  [<CommonParameters>]
 ```
 
-### CategoryPolicy
-```
-Add-VivaModuleFeaturePolicy -CategoryId <String> -IsCategoryEnabled <Boolean> -Name <String>
- [-Confirm]
- [-Everyone]
- [-GroupIds <String[]>]
- [-ResultSize <Unlimited>]
- [-UserIds <String[]>]
- [-WhatIf]
- [<CommonParameters>]
-```
-
 ## DESCRIPTION
-Use the Add-VivaModuleFeaturePolicy cmdlet to add a new access policy for a specific feature or category in Viva.
-
-Support for categories is available in version 3.5.0-Preview2 or later of the module.
+Use the Add-VivaModuleFeaturePolicy cmdlet to add a new access policy for a specific feature in Viva.
 
 You need to use the Connect-ExchangeOnline cmdlet to authenticate.
 
@@ -106,61 +88,13 @@ This example adds a policy for the Reflection feature in Viva Insights. The poli
 
 ### Example 5
 ```powershell
-Add-VivaModuleFeaturePolicy -CategoryId <category_id> -Name DisableCategoryForAll -IsCategoryEnabled $false -Everyone
-```
-
-This example adds a policy for the `<category_id>` category in Viva. The policy disables the category (effectively all features under the category) for all users in the organization.
-
-### Example 6
-```powershell
-Add-VivaModuleFeaturePolicy -CategoryId <category_id> -Name MultipleGroups -IsCategoryEnabled $false -GroupIds group1@contoso.com,group2@contoso.com,57680382-61a5-4378-85ad-f72095d4e9c3
-```
-
-This example adds a policy for the `<category_id>` category in Viva. The policy disables the category (effectively all features under the category) for all users in the specified groups.
-
-### Example 7
-```powershell
-Add-VivaModuleFeaturePolicy -CategoryId <category_id> -Name MultipleUsers -IsCategoryEnabled $false -UserIds user1@contoso.com,user2@contoso.com
+Add-VivaModuleFeaturePolicy -ModuleId PeopleSkills -FeatureId ShowAISkills -Name SoftDisableShowAISkillsPolicy -IsFeatureEnabled $true -IsUserControlEnabled $true -IsUserOptedInByDefault $false -UserIds user1@contoso.com,user2@contoso.com
 ```
 
-This example adds a policy for the `<category_id>` category in Viva. The policy disables the category (effectively all features under the category) for the specified users.
-
-### Example 8
-```powershell
-Add-VivaModuleFeaturePolicy -CategoryId <category_id> -Name UsersAndGroups -IsCategoryEnabled $false -GroupIds group1@contoso.com,group2@contoso.com,57680382-61a5-4378-85ad-f72095d4e9c3 -UserIds user1@contoso.com,user2@contoso.com
-```
-
-This example adds a policy for the `<category_id>` category in Viva. The policy disables the category (effectively all features under the category) for the specified users and group members.
-
-### Example 9
-```powershell
-Add-VivaModuleFeaturePolicy -CategoryId <category_id> -Name "Disable Category For All" -IsCategoryEnabled $false -Everyone
-```
-
-This example adds a policy for the `<category_id>` category in Viva where the policy name is with spaces. The policy disables the category (effectively all features under the category) for all users in the organization.
+This example adds a policy for the ShowAISkills feature in Viva Skills. The policy enables the feature for the specified users, allows user controls, and opted out users by default (Soft Disable policy).
 
 ## PARAMETERS
 
-### -CategoryId
-This parameter is available in version 3.5.0-Preview2 or later of the module.
-
-**Note**: Currently, no categories are available in Viva. We'll update the documentation when categories are available.
-
-The CategoryId parameter specifies the Viva category that you want to add the policy for.
-
-```yaml
-Type: String
-Parameter Sets: CategoryPolicy
-Aliases:
-Applicable: Exchange Online
-
-Required: True
-Position: Named
-Default value: None
-Accept pipeline input: False
-Accept wildcard characters: False
-```
-
 ### -FeatureId
 The FeatureId parameter specifies the feature in the Viva module that you want to add the policy for.
 
@@ -179,29 +113,6 @@ Accept pipeline input: False
 Accept wildcard characters: False
 ```
 
-### -IsCategoryEnabled
-This parameter is available in version 3.5.0-Preview2 or later of the module.
-
-**Note**: Currently, no categories are available in Viva. We'll update the documentation when categories are available.
-
-The IsCategoryEnabled parameter specifies whether or not the category is enabled by the policy. Valid values are:
-
-- $true: The category is enabled by the policy.
-- $false: The category is not enabled by the policy.
-
-```yaml
-Type: Boolean
-Parameter Sets: CategoryPolicy
-Aliases:
-Applicable: Exchange Online
-
-Required: True
-Position: Named
-Default value: None
-Accept pipeline input: False
-Accept wildcard characters: False
-```
-
 ### -IsFeatureEnabled
 The IsFeatureEnabled parameter specifies whether or not the feature is enabled by the policy. Valid values are:
 
@@ -339,6 +250,29 @@ Accept pipeline input: False
 Accept wildcard characters: False
 ```
 
+### -IsUserOptedInByDefault
+This parameter is available in version 3.8.0 or later of the module.
+
+The IsUserOptedInByDefault parameter specifies whether user opted in by default by the policy. Valid values are:
+
+- $true: User opted in by the policy.
+- $false: User opted out by the policy.
+
+Only features that allow admins to enable and disable user controls by policy can use this parameter. If the feature doesn't support admins toggling user controls, the default value applies. See the feature documentation for more information.
+
+```yaml
+Type: Boolean
+Parameter Sets: FeaturePolicy
+Aliases:
+Applicable: Exchange Online
+
+Required: False
+Position: Named
+Default value: None
+Accept pipeline input: False
+Accept wildcard characters: False
+```
+
 ### -ResultSize
 This parameter is reserved for internal Microsoft use.
 

From b005adfdecf8abaa7f9156dfe14d3db2c4ffc2cd Mon Sep 17 00:00:00 2001
From: knovichenko <162521447+knovichenko@users.noreply.github.com>
Date: Thu, 3 Apr 2025 10:42:25 -0700
Subject: [PATCH 04/24] Update Remove-VivaModuleFeaturePolicy.md

Removed category-related documentation.
---
 .../Remove-VivaModuleFeaturePolicy.md         | 46 +------------------
 1 file changed, 2 insertions(+), 44 deletions(-)

diff --git a/exchange/exchange-ps/exchange/Remove-VivaModuleFeaturePolicy.md b/exchange/exchange-ps/exchange/Remove-VivaModuleFeaturePolicy.md
index 77b55f5a7c..9c2159f4e6 100644
--- a/exchange/exchange-ps/exchange/Remove-VivaModuleFeaturePolicy.md
+++ b/exchange/exchange-ps/exchange/Remove-VivaModuleFeaturePolicy.md
@@ -15,9 +15,7 @@ ms.reviewer:
 ## SYNOPSIS
 This cmdlet is available only in the Exchange Online PowerShell module v3.2.0 or later. For more information, see [About the Exchange Online PowerShell module](https://aka.ms/exov3-module).
 
-**Note**: Support for categories is available in version 3.5.0-Preview2 or later of the module, but no categories are currently available in Viva. We'll update the documentation when categories are available.
-
-Use the Remove-VivaModuleFeaturePolicy cmdlet to delete an access policy for a feature in a Viva module or a category in Viva. Once you delete a policy, the policy is permanently deleted. You cannot undo the deletion.
+Use the Remove-VivaModuleFeaturePolicy cmdlet to delete an access policy for a feature in a Viva module in Viva. Once you delete a policy, the policy is permanently deleted. You cannot undo the deletion.
 
 For information about the parameter sets in the Syntax section below, see [Exchange cmdlet syntax](https://learn.microsoft.com/powershell/exchange/exchange-cmdlet-syntax).
 
@@ -32,19 +30,8 @@ Remove-VivaModuleFeaturePolicy -FeatureId <String> -ModuleId <String> -PolicyId
  [<CommonParameters>]
 ```
 
-### CategoryPolicy
-```
-Remove-VivaModuleFeaturePolicy -CategoryId <String> -PolicyId <String>
- [-Confirm]
- [-ResultSize <Unlimited>]
- [-WhatIf]
- [<CommonParameters>]
-```
-
 ## DESCRIPTION
-Use the Remove-VivaModuleFeaturePolicy cmdlet to delete an access policy for a feature in a Viva module or a category in Viva.
-
-Support for categories is available in version 3.5.0-Preview2 or later of the module.
+Use the Remove-VivaModuleFeaturePolicy cmdlet to delete an access policy for a feature in a Viva module in Viva.
 
 You need to use the Connect-ExchangeOnline cmdlet to authenticate.
 
@@ -68,37 +55,8 @@ Remove-VivaModuleFeaturePolicy -ModuleId VivaInsights -FeatureId Reflection -Pol
 
 This example deletes the specified policy for the Reflection feature in Viva Insights.
 
-### Example 2
-```powershell
-Remove-VivaModuleFeaturePolicy -CategoryId <category_id> -PolicyId 3db38dfa-02a3-4039-b33a-42b0b3da032w
-```
-
-This example deletes the specified policy for the `<category_id>` category in Viva.
-
 ## PARAMETERS
 
-### -CategoryId
-This parameter is available in version 3.5.0-Preview2 or later of the module.
-
-**Note**: Currently, no categories are available in Viva. We'll update the documentation when categories are available.
-
-The CategoryId parameter specifies the category that you want to remove the policy from.
-
-To view details about the categories that support feature access controls, use the Get-VivaFeatureCategory cmdlet. The CategoryId value is returned in the output of the cmdlet.
-
-```yaml
-Type: String
-Parameter Sets: CategoryPolicy
-Aliases:
-Applicable: Exchange Online
-
-Required: True
-Position: Named
-Default value: None
-Accept pipeline input: False
-Accept wildcard characters: False
-```
-
 ### -FeatureId
 The FeatureId parameter specifies the feature in the Viva module that you want to remove the policy from.
 

From 4e5bab60a5f6a12754d0866ebd8b2580c9d4c9c8 Mon Sep 17 00:00:00 2001
From: knovichenko <162521447+knovichenko@users.noreply.github.com>
Date: Thu, 3 Apr 2025 11:22:47 -0700
Subject: [PATCH 05/24] Delete
 exchange/exchange-ps/exchange/Get-VivaFeatureCategory.md

Removing all category-related documentation.
---
 .../exchange/Get-VivaFeatureCategory.md       | 79 -------------------
 1 file changed, 79 deletions(-)
 delete mode 100644 exchange/exchange-ps/exchange/Get-VivaFeatureCategory.md

diff --git a/exchange/exchange-ps/exchange/Get-VivaFeatureCategory.md b/exchange/exchange-ps/exchange/Get-VivaFeatureCategory.md
deleted file mode 100644
index 575099e813..0000000000
--- a/exchange/exchange-ps/exchange/Get-VivaFeatureCategory.md
+++ /dev/null
@@ -1,79 +0,0 @@
----
-external help file: Microsoft.Exchange.Management.RestApiClient.dll-Help.xml
-Module Name: ExchangeOnlineManagement
-online version: https://learn.microsoft.com/powershell/module/exchange/get-vivafeaturecategory
-applicable: Exchange Online
-title: Get-VivaFeatureCategory
-schema: 2.0.0
-author: chrisda
-ms.author: chrisda
-ms.reviewer:
----
-
-# Get-VivaFeatureCategory
-
-## SYNOPSIS
-This cmdlet is available only in the Exchange Online PowerShell module v3.5.0 or later. For more information, see [About the Exchange Online PowerShell module](https://aka.ms/exov3-module).
-
-**Note**: While we are adding support for category policies in the Exchange Online PowerShell module v3.5.0-Preview1 or later, we have not yet released any categories in Viva. We will update when there are categories available.
-
-Use the Get-VivaFeatureCategory cmdlet to view all categories in Viva that support feature access controls. This cmdlet provides details about the categories, including the category identifiers, descriptions, and Viva module features that belong to the category. A category contains a group of features in the same or different Viva module.
-
-For information about the parameter sets in the Syntax section below, see [Exchange cmdlet syntax](https://learn.microsoft.com/powershell/exchange/exchange-cmdlet-syntax).
-
-## SYNTAX
-
-```
-Get-VivaFeatureCategory
- [-ResultSize <Unlimited>]
- [<CommonParameters>]
-```
-
-## DESCRIPTION
-Use the Get-VivaFeatureCategory cmdlet to view the categories in Viva that support feature access controls.
-
-You need to use the Connect-ExchangeOnline cmdlet to authenticate.
-
-This cmdlet requires the .NET Framework 4.7.2 or later.
-
-## EXAMPLES
-
-### Example 1
-```powershell
-Get-VivaFeatureCategory
-```
-
-This example returns all categories in Viva that support feature access controls.
-
-## PARAMETERS
-
-### -ResultSize
-This parameter is reserved for internal Microsoft use.
-
-```yaml
-Type: Unlimited
-Parameter Sets: (All)
-Aliases:
-
-Required: False
-Position: Named
-Default value: None
-Accept pipeline input: False
-Accept wildcard characters: False
-```
-
-### CommonParameters
-This cmdlet supports the common parameters: -Debug, -ErrorAction, -ErrorVariable, -InformationAction, -InformationVariable, -OutVariable, -OutBuffer, -PipelineVariable, -Verbose, -WarningAction, and -WarningVariable. For more information, see [about_CommonParameters](https://go.microsoft.com/fwlink/p/?LinkID=113216).
-
-## INPUTS
-
-## OUTPUTS
-
-## NOTES
-
-## RELATED LINKS
-[Exchange PowerShell](https://learn.microsoft.com/powershell/module/exchange)
-
-[About the Exchange Online PowerShell module](https://learn.microsoft.com/powershell/exchange/exchange-online-powershell-v2)
-
-[Role template IDs](https://learn.microsoft.com/entra/identity/role-based-access-control/permissions-reference#role-template-ids)

From 2c60b92ec118156eea5de481c5df65c9bbd8e8a5 Mon Sep 17 00:00:00 2001
From: knovichenko <162521447+knovichenko@users.noreply.github.com>
Date: Thu, 3 Apr 2025 11:57:48 -0700
Subject: [PATCH 06/24] Update Add-VivaModuleFeaturePolicy.md

Updated the version of the release for the new parameter.
---
 exchange/exchange-ps/exchange/Add-VivaModuleFeaturePolicy.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/exchange/exchange-ps/exchange/Add-VivaModuleFeaturePolicy.md b/exchange/exchange-ps/exchange/Add-VivaModuleFeaturePolicy.md
index b2f902e2b7..dcbc99d4cc 100644
--- a/exchange/exchange-ps/exchange/Add-VivaModuleFeaturePolicy.md
+++ b/exchange/exchange-ps/exchange/Add-VivaModuleFeaturePolicy.md
@@ -251,7 +251,7 @@ Accept wildcard characters: False
 ```
 
 ### -IsUserOptedInByDefault
-This parameter is available in version 3.8.0 or later of the module.
+This parameter is available in version 3.8.0-Preview2 or later of the module.
 
 The IsUserOptedInByDefault parameter specifies whether user opted in by default by the policy. Valid values are:
 

From e9849d4bbd75bf051471d536b66e6e30cf69f24d Mon Sep 17 00:00:00 2001
From: knovichenko <162521447+knovichenko@users.noreply.github.com>
Date: Thu, 3 Apr 2025 12:01:24 -0700
Subject: [PATCH 07/24] Update Update-VivaModuleFeaturePolicy.md

Added the new parameter and new example for the parameter.
---
 .../Update-VivaModuleFeaturePolicy.md         | 30 +++++++++++++++++++
 1 file changed, 30 insertions(+)

diff --git a/exchange/exchange-ps/exchange/Update-VivaModuleFeaturePolicy.md b/exchange/exchange-ps/exchange/Update-VivaModuleFeaturePolicy.md
index 1970be93e2..542feac9a6 100644
--- a/exchange/exchange-ps/exchange/Update-VivaModuleFeaturePolicy.md
+++ b/exchange/exchange-ps/exchange/Update-VivaModuleFeaturePolicy.md
@@ -99,6 +99,13 @@ Update-VivaModuleFeaturePolicy -ModuleId VivaInsights -FeatureId Reflection -Pol
 
 This example updates the name of the specified policy, makes it so the policy enables the feature, and updates who the policy applies to. The policy now applies **only** to the specified users and groups, overwriting the users and groups the policy used to apply to.
 
+### Example 5
+```powershell
+Update-VivaModuleFeaturePolicy -ModuleId PeopleSkills -FeatureId ShowAISkills -PolicyId 3db38dfa-02a3-4039-b33a-42b0b3da029b -IsFeatureEnabled $true -IsUserControlEnabled $true -IsUserOptedInByDefault $false
+```
+
+This example updates a policy for the ShowAISkills feature in Viva Skills. The policy enables the feature for the the users previously added to the policy, allows user controls, and opted out users by default (Soft Disable policy).
+
 ## PARAMETERS
 
 ### -FeatureId
@@ -266,6 +273,29 @@ Accept pipeline input: False
 Accept wildcard characters: False
 ```
 
+### -IsUserOptedInByDefault
+This parameter is available in version 3.8.0-Preview2 or later of the module.
+
+The IsUserOptedInByDefault parameter specifies whether user opted in by default by the policy. Valid values are:
+
+- $true: User opted in by the policy.
+- $false: User opted out by the policy.
+
+Only features that allow admins to enable and disable user controls by policy can use this parameter. If the feature doesn't support admins toggling user controls, the default value applies. See the feature documentation for more information.
+
+```yaml
+Type: Boolean
+Parameter Sets: FeaturePolicy
+Aliases:
+Applicable: Exchange Online
+
+Required: False
+Position: Named
+Default value: None
+Accept pipeline input: False
+Accept wildcard characters: False
+```
+
 ### -Name
 The Name parameter specifies the updated name for the policy. The maximum length is 256 characters. If the value contains spaces, enclose the value in quotation marks (").
 

From 4e7a0cb1d3ae3764aa2d0dbf217881c6b5cb9c24 Mon Sep 17 00:00:00 2001
From: Chris Davis <chris.davis@microsoft.com>
Date: Thu, 3 Apr 2025 13:43:42 -0700
Subject: [PATCH 08/24] Add IsUserOptedInByDefault parameter

---
 .../exchange-ps/exchange/Update-VivaModuleFeaturePolicy.md     | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/exchange/exchange-ps/exchange/Update-VivaModuleFeaturePolicy.md b/exchange/exchange-ps/exchange/Update-VivaModuleFeaturePolicy.md
index 542feac9a6..e3f95e0d47 100644
--- a/exchange/exchange-ps/exchange/Update-VivaModuleFeaturePolicy.md
+++ b/exchange/exchange-ps/exchange/Update-VivaModuleFeaturePolicy.md
@@ -34,6 +34,7 @@ Update-VivaModuleFeaturePolicy -FeatureId <String> -ModuleId <String> -PolicyId
  [-Everyone <Boolean>]
  [-IsFeatureEnabled <Boolean>]
  [-IsUserControlEnabled <Boolean>]
+ [-IsUserOptedInByDefault <Boolean>]
  [-GroupIds <String[]>]
  [-Name <String>]
  [-ResultSize <Unlimited>]
@@ -285,7 +286,7 @@ Only features that allow admins to enable and disable user controls by policy ca
 
 ```yaml
 Type: Boolean
-Parameter Sets: FeaturePolicy
+Parameter Sets: (All)
 Aliases:
 Applicable: Exchange Online
 

From aca3ca74a9c8f39fe88257e350c4f0001a1e0e75 Mon Sep 17 00:00:00 2001
From: Chris Davis <chris.davis@microsoft.com>
Date: Thu, 3 Apr 2025 13:45:18 -0700
Subject: [PATCH 09/24] Parameter sets update

---
 .../exchange/Add-VivaModuleFeaturePolicy.md          | 12 +++++-------
 .../exchange/Get-VivaModuleFeaturePolicy.md          |  4 ++--
 .../exchange/Remove-VivaModuleFeaturePolicy.md       |  4 ++--
 3 files changed, 9 insertions(+), 11 deletions(-)

diff --git a/exchange/exchange-ps/exchange/Add-VivaModuleFeaturePolicy.md b/exchange/exchange-ps/exchange/Add-VivaModuleFeaturePolicy.md
index b2f902e2b7..61807927e7 100644
--- a/exchange/exchange-ps/exchange/Add-VivaModuleFeaturePolicy.md
+++ b/exchange/exchange-ps/exchange/Add-VivaModuleFeaturePolicy.md
@@ -26,8 +26,6 @@ Some features include the option for user controls (user opt out). Refer to the
 For information about the parameter sets in the Syntax section below, see [Exchange cmdlet syntax](https://learn.microsoft.com/powershell/exchange/exchange-cmdlet-syntax).
 
 ## SYNTAX
-
-### FeaturePolicy
 ```
 Add-VivaModuleFeaturePolicy -FeatureId <String> -IsFeatureEnabled <Boolean> -ModuleId <String> -Name <String>
  [-Confirm]
@@ -102,7 +100,7 @@ To view details about the features in a Viva module that support feature access
 
 ```yaml
 Type: String
-Parameter Sets: FeaturePolicy
+Parameter Sets: (All)
 Aliases:
 Applicable: Exchange Online
 
@@ -121,7 +119,7 @@ The IsFeatureEnabled parameter specifies whether or not the feature is enabled b
 
 ```yaml
 Type: Boolean
-Parameter Sets: FeaturePolicy
+Parameter Sets: (All)
 Aliases:
 Applicable: Exchange Online
 
@@ -137,7 +135,7 @@ The ModuleId parameter specifies the Viva module that you want to add the featur
 
 ```yaml
 Type: String
-Parameter Sets: FeaturePolicy
+Parameter Sets: (All)
 Aliases:
 Applicable: Exchange Online
 
@@ -239,7 +237,7 @@ Only features that allow admins to enable and disable user controls by policy ca
 
 ```yaml
 Type: Boolean
-Parameter Sets: FeaturePolicy
+Parameter Sets: (All)
 Aliases:
 Applicable: Exchange Online
 
@@ -262,7 +260,7 @@ Only features that allow admins to enable and disable user controls by policy ca
 
 ```yaml
 Type: Boolean
-Parameter Sets: FeaturePolicy
+Parameter Sets: (All)
 Aliases:
 Applicable: Exchange Online
 
diff --git a/exchange/exchange-ps/exchange/Get-VivaModuleFeaturePolicy.md b/exchange/exchange-ps/exchange/Get-VivaModuleFeaturePolicy.md
index 79cf7fc362..7189236f24 100644
--- a/exchange/exchange-ps/exchange/Get-VivaModuleFeaturePolicy.md
+++ b/exchange/exchange-ps/exchange/Get-VivaModuleFeaturePolicy.md
@@ -72,7 +72,7 @@ To view details about the features in a Viva module that support feature access
 
 ```yaml
 Type: String
-Parameter Sets: FeaturePolicy
+Parameter Sets: (All)
 Aliases:
 Applicable: Exchange Online
 
@@ -88,7 +88,7 @@ The ModuleId parameter specifies the Viva module of the feature policies that yo
 
 ```yaml
 Type: String
-Parameter Sets: FeaturePolicy
+Parameter Sets: (All)
 Aliases:
 Applicable: Exchange Online
 
diff --git a/exchange/exchange-ps/exchange/Remove-VivaModuleFeaturePolicy.md b/exchange/exchange-ps/exchange/Remove-VivaModuleFeaturePolicy.md
index 9c2159f4e6..f6d95188a7 100644
--- a/exchange/exchange-ps/exchange/Remove-VivaModuleFeaturePolicy.md
+++ b/exchange/exchange-ps/exchange/Remove-VivaModuleFeaturePolicy.md
@@ -64,7 +64,7 @@ To view details about the features in a Viva module that support feature access
 
 ```yaml
 Type: String
-Parameter Sets: FeaturePolicy
+Parameter Sets: (All)
 Aliases:
 Applicable: Exchange Online
 
@@ -80,7 +80,7 @@ The ModuleId parameter specifies the Viva module of the feature that you want to
 
 ```yaml
 Type: String
-Parameter Sets: FeaturePolicy
+Parameter Sets: (All)
 Aliases:
 Applicable: Exchange Online
 

From b2a31e03becfdf6c75a4c8a267e761996ae7432d Mon Sep 17 00:00:00 2001
From: Chris Davis <chris.davis@microsoft.com>
Date: Thu, 3 Apr 2025 13:46:10 -0700
Subject: [PATCH 10/24] Update Update-VivaModuleFeaturePolicy.md

---
 .../exchange/Update-VivaModuleFeaturePolicy.md         | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/exchange/exchange-ps/exchange/Update-VivaModuleFeaturePolicy.md b/exchange/exchange-ps/exchange/Update-VivaModuleFeaturePolicy.md
index e3f95e0d47..0b8c20497f 100644
--- a/exchange/exchange-ps/exchange/Update-VivaModuleFeaturePolicy.md
+++ b/exchange/exchange-ps/exchange/Update-VivaModuleFeaturePolicy.md
@@ -26,8 +26,6 @@ Some features include the option for user controls (user opt out). Refer to the
 For information about the parameter sets in the Syntax section below, see [Exchange cmdlet syntax](https://learn.microsoft.com/powershell/exchange/exchange-cmdlet-syntax).
 
 ## SYNTAX
-
-### FeaturePolicy
 ```
 Update-VivaModuleFeaturePolicy -FeatureId <String> -ModuleId <String> -PolicyId <String>
  [-Confirm]
@@ -116,7 +114,7 @@ To view details about the features in a Viva module that support feature access
 
 ```yaml
 Type: String
-Parameter Sets: FeaturePolicy
+Parameter Sets: (All)
 Aliases:
 Applicable: Exchange Online
 
@@ -132,7 +130,7 @@ The ModuleId parameter specifies the Viva module of the policy that you want to
 
 ```yaml
 Type: String
-Parameter Sets: FeaturePolicy
+Parameter Sets: (All)
 Aliases:
 Applicable: Exchange Online
 
@@ -238,7 +236,7 @@ If you don't want to update whether the feature is enabled by the policy, don't
 
 ```yaml
 Type: Boolean
-Parameter Sets: FeaturePolicy
+Parameter Sets: (All)
 Aliases:
 Applicable: Exchange Online
 
@@ -263,7 +261,7 @@ If you don't want to update whether the user control is enabled by the policy, d
 
 ```yaml
 Type: Boolean
-Parameter Sets: FeaturePolicy
+Parameter Sets: (All)
 Aliases:
 Applicable: Exchange Online
 

From ebf806335491a561def732dacbd319f411166f50 Mon Sep 17 00:00:00 2001
From: Chris Davis <chris.davis@microsoft.com>
Date: Thu, 3 Apr 2025 13:47:13 -0700
Subject: [PATCH 11/24] Syntax blocks

---
 exchange/exchange-ps/exchange/Get-VivaModuleFeaturePolicy.md    | 2 --
 exchange/exchange-ps/exchange/Remove-VivaModuleFeaturePolicy.md | 2 --
 2 files changed, 4 deletions(-)

diff --git a/exchange/exchange-ps/exchange/Get-VivaModuleFeaturePolicy.md b/exchange/exchange-ps/exchange/Get-VivaModuleFeaturePolicy.md
index 7189236f24..f72e51b51b 100644
--- a/exchange/exchange-ps/exchange/Get-VivaModuleFeaturePolicy.md
+++ b/exchange/exchange-ps/exchange/Get-VivaModuleFeaturePolicy.md
@@ -20,8 +20,6 @@ Use the Get-VivaModuleFeaturePolicy cmdlet to view the access policies for a spe
 For information about the parameter sets in the Syntax section below, see [Exchange cmdlet syntax](https://learn.microsoft.com/powershell/exchange/exchange-cmdlet-syntax).
 
 ## SYNTAX
-
-### FeaturePolicy
 ```
 Get-VivaModuleFeaturePolicy -FeatureId <String> -ModuleId <String>
  [[-PolicyId] <String>]
diff --git a/exchange/exchange-ps/exchange/Remove-VivaModuleFeaturePolicy.md b/exchange/exchange-ps/exchange/Remove-VivaModuleFeaturePolicy.md
index f6d95188a7..e263889a41 100644
--- a/exchange/exchange-ps/exchange/Remove-VivaModuleFeaturePolicy.md
+++ b/exchange/exchange-ps/exchange/Remove-VivaModuleFeaturePolicy.md
@@ -20,8 +20,6 @@ Use the Remove-VivaModuleFeaturePolicy cmdlet to delete an access policy for a f
 For information about the parameter sets in the Syntax section below, see [Exchange cmdlet syntax](https://learn.microsoft.com/powershell/exchange/exchange-cmdlet-syntax).
 
 ## SYNTAX
-
-### FeaturePolicy
 ```
 Remove-VivaModuleFeaturePolicy -FeatureId <String> -ModuleId <String> -PolicyId <String>
  [-Confirm]

From c2451b1f1130dae6532e4ff8c35ba8b38a373205 Mon Sep 17 00:00:00 2001
From: Chris Davis <chris.davis@microsoft.com>
Date: Thu, 3 Apr 2025 13:54:01 -0700
Subject: [PATCH 12/24] Update Add-VivaModuleFeaturePolicy.md

---
 exchange/exchange-ps/exchange/Add-VivaModuleFeaturePolicy.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/exchange/exchange-ps/exchange/Add-VivaModuleFeaturePolicy.md b/exchange/exchange-ps/exchange/Add-VivaModuleFeaturePolicy.md
index bd92b31315..f9d5aa3729 100644
--- a/exchange/exchange-ps/exchange/Add-VivaModuleFeaturePolicy.md
+++ b/exchange/exchange-ps/exchange/Add-VivaModuleFeaturePolicy.md
@@ -32,6 +32,7 @@ Add-VivaModuleFeaturePolicy -FeatureId <String> -IsFeatureEnabled <Boolean> -Mod
  [-Everyone]
  [-GroupIds <String[]>]
  [-IsUserControlEnabled <Boolean>]
+ [-IsUserOptedInByDefault <Boolean>]
  [-ResultSize <Unlimited>]
  [-UserIds <String[]>]
  [-WhatIf]

From 94d9eda3a3f32f07aee481896dce58c060523ccb Mon Sep 17 00:00:00 2001
From: Chris Davis <chris.davis@microsoft.com>
Date: Thu, 3 Apr 2025 14:03:16 -0700
Subject: [PATCH 13/24] Update .openpublishing.redirection.json

Get-VivaFeatureCategory
---
 .openpublishing.redirection.json | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/.openpublishing.redirection.json b/.openpublishing.redirection.json
index 6a71f4fa5c..17253bd2f1 100644
--- a/.openpublishing.redirection.json
+++ b/.openpublishing.redirection.json
@@ -7143,6 +7143,11 @@
       "redirect_url": "/powershell/module/exchange/get-exosecopsoverriderule",
       "redirect_document_id": false
     },
+    {
+      "source_path": "exchange/virtual-folder/exchange/Get-VivaFeatureCategory.md",
+      "redirect_url": "/viva/feature-access-management",
+      "redirect_document_id": false
+    },
     {
       "source_path": "skype/virtual-folder/skype/Disable-CsOnlineSipDomain.md",
       "redirect_url": "/powershell/module/teams/Disable-CsOnlineSipDomain",

From 1a791ac851512d21099fe7da42cae44ee0aeb524 Mon Sep 17 00:00:00 2001
From: blackquack <LWILL@microsoft.com>
Date: Thu, 3 Apr 2025 14:30:14 -0700
Subject: [PATCH 14/24] Update New-CsTeamsCallingPolicy.md

---
 teams/teams-ps/teams/New-CsTeamsCallingPolicy.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/teams/teams-ps/teams/New-CsTeamsCallingPolicy.md b/teams/teams-ps/teams/New-CsTeamsCallingPolicy.md
index b2f1727ab5..638a131b09 100644
--- a/teams/teams-ps/teams/New-CsTeamsCallingPolicy.md
+++ b/teams/teams-ps/teams/New-CsTeamsCallingPolicy.md
@@ -397,8 +397,8 @@ Accept wildcard characters: False
 Setting this parameter lets you control how Copilot is used during calls and if transcription is needed to be turned on and saved after the call.
 
 Valid options are:
-- Enabled: Copilot can work with or without transcription during calls.
-- EnabledWithTranscript: Copilot will only work when transcription is enabled during calls. This is the default value.
+- Enabled: Copilot can work with or without transcription during calls. This is the default value.
+- EnabledWithTranscript: Copilot will only work when transcription is enabled during calls.
 - Disabled: Copilot is disabled for calls.
 
 ```yaml

From d12eefbf345a31f70a7f2292eaed707ce3fb9114 Mon Sep 17 00:00:00 2001
From: blackquack <LWILL@microsoft.com>
Date: Thu, 3 Apr 2025 14:32:26 -0700
Subject: [PATCH 15/24] Update Set-CsTeamsCallingPolicy.md

---
 teams/teams-ps/teams/Set-CsTeamsCallingPolicy.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/teams/teams-ps/teams/Set-CsTeamsCallingPolicy.md b/teams/teams-ps/teams/Set-CsTeamsCallingPolicy.md
index 58917c6e97..1f3a0f0fe7 100644
--- a/teams/teams-ps/teams/Set-CsTeamsCallingPolicy.md
+++ b/teams/teams-ps/teams/Set-CsTeamsCallingPolicy.md
@@ -401,8 +401,8 @@ Accept wildcard characters: False
 Setting this parameter lets you control how Copilot is used during calls and if transcription is needed to be turned on and saved after the call.
 
 Valid options are:
-- Enabled: Copilot can work with or without transcription during calls.
-- EnabledWithTranscript: Copilot will only work when transcription is enabled during calls. This is the default value.
+- Enabled: Copilot can work with or without transcription during calls. This is the default value.
+- EnabledWithTranscript: Copilot will only work when transcription is enabled during calls.
 - Disabled: Copilot is disabled for calls.
 
 ```yaml

From 91e55fb4a676996fb92f682f760e405070063a07 Mon Sep 17 00:00:00 2001
From: knovichenko <162521447+knovichenko@users.noreply.github.com>
Date: Fri, 4 Apr 2025 11:26:44 -0700
Subject: [PATCH 16/24] Update Update-VivaModuleFeaturePolicy.md

Updated IsUserOptedInByDefault parameter description
---
 .../exchange-ps/exchange/Update-VivaModuleFeaturePolicy.md  | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/exchange/exchange-ps/exchange/Update-VivaModuleFeaturePolicy.md b/exchange/exchange-ps/exchange/Update-VivaModuleFeaturePolicy.md
index 0b8c20497f..589b3b422d 100644
--- a/exchange/exchange-ps/exchange/Update-VivaModuleFeaturePolicy.md
+++ b/exchange/exchange-ps/exchange/Update-VivaModuleFeaturePolicy.md
@@ -277,10 +277,10 @@ This parameter is available in version 3.8.0-Preview2 or later of the module.
 
 The IsUserOptedInByDefault parameter specifies whether user opted in by default by the policy. Valid values are:
 
-- $true: User opted in by the policy.
-- $false: User opted out by the policy.
+- $true: User is Opted in by default by the policy if the user has not set a preference.
+- $false: User is Opted out by default by the policy if the user has not set a preference.
 
-Only features that allow admins to enable and disable user controls by policy can use this parameter. If the feature doesn't support admins toggling user controls, the default value applies. See the feature documentation for more information.
+An optional parameter. This parameter can be used to override the default user opt-in value set in the feature metadata. This parameter can be only be set when -IsUserControlEnabled parameter is set to $true.
 
 ```yaml
 Type: Boolean

From 5300f97d495c127da3a271cdf0da1d19e1bc574a Mon Sep 17 00:00:00 2001
From: knovichenko <162521447+knovichenko@users.noreply.github.com>
Date: Fri, 4 Apr 2025 11:27:06 -0700
Subject: [PATCH 17/24] Update Add-VivaModuleFeaturePolicy.md

Updated IsUserOptedInByDefault parameter description
---
 .../exchange-ps/exchange/Add-VivaModuleFeaturePolicy.md     | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/exchange/exchange-ps/exchange/Add-VivaModuleFeaturePolicy.md b/exchange/exchange-ps/exchange/Add-VivaModuleFeaturePolicy.md
index f9d5aa3729..f7e9aa0f06 100644
--- a/exchange/exchange-ps/exchange/Add-VivaModuleFeaturePolicy.md
+++ b/exchange/exchange-ps/exchange/Add-VivaModuleFeaturePolicy.md
@@ -254,10 +254,10 @@ This parameter is available in version 3.8.0-Preview2 or later of the module.
 
 The IsUserOptedInByDefault parameter specifies whether user opted in by default by the policy. Valid values are:
 
-- $true: User opted in by the policy.
-- $false: User opted out by the policy.
+- $true: User is Opted in by default by the policy if the user has not set a preference.
+- $false: User is Opted out by default by the policy if the user has not set a preference.
 
-Only features that allow admins to enable and disable user controls by policy can use this parameter. If the feature doesn't support admins toggling user controls, the default value applies. See the feature documentation for more information.
+An optional parameter. This parameter can be used to override the default user opt-in value set in the feature metadata. This parameter can be only be set when -IsUserControlEnabled parameter is set to $true.
 
 ```yaml
 Type: Boolean

From 6ce944f6de3866cbb1fe83944514464a920d8e74 Mon Sep 17 00:00:00 2001
From: Chris Davis <chris.davis@microsoft.com>
Date: Fri, 4 Apr 2025 11:48:26 -0700
Subject: [PATCH 18/24] Clarify optional parameter usage in documentation

---
 .../exchange-ps/exchange/Update-VivaModuleFeaturePolicy.md    | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/exchange/exchange-ps/exchange/Update-VivaModuleFeaturePolicy.md b/exchange/exchange-ps/exchange/Update-VivaModuleFeaturePolicy.md
index 589b3b422d..12c0d9395a 100644
--- a/exchange/exchange-ps/exchange/Update-VivaModuleFeaturePolicy.md
+++ b/exchange/exchange-ps/exchange/Update-VivaModuleFeaturePolicy.md
@@ -280,7 +280,9 @@ The IsUserOptedInByDefault parameter specifies whether user opted in by default
 - $true: User is Opted in by default by the policy if the user has not set a preference.
 - $false: User is Opted out by default by the policy if the user has not set a preference.
 
-An optional parameter. This parameter can be used to override the default user opt-in value set in the feature metadata. This parameter can be only be set when -IsUserControlEnabled parameter is set to $true.
+This parameter is optional and can be used to override the default user opt-in value set in the feature metadata.
+
+This parameter can be set only when the IsUserControlEnabled parameter is set to $true.
 
 ```yaml
 Type: Boolean

From 3ff1ea41b55e8d972ccac40cdc634046d3618a18 Mon Sep 17 00:00:00 2001
From: Chris Davis <chris.davis@microsoft.com>
Date: Mon, 7 Apr 2025 10:59:13 -0700
Subject: [PATCH 19/24] Clarify IsUserOptedInByDefault parameter description

---
 .../exchange/Add-VivaModuleFeaturePolicy.md            | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/exchange/exchange-ps/exchange/Add-VivaModuleFeaturePolicy.md b/exchange/exchange-ps/exchange/Add-VivaModuleFeaturePolicy.md
index f7e9aa0f06..340921a576 100644
--- a/exchange/exchange-ps/exchange/Add-VivaModuleFeaturePolicy.md
+++ b/exchange/exchange-ps/exchange/Add-VivaModuleFeaturePolicy.md
@@ -252,12 +252,14 @@ Accept wildcard characters: False
 ### -IsUserOptedInByDefault
 This parameter is available in version 3.8.0-Preview2 or later of the module.
 
-The IsUserOptedInByDefault parameter specifies whether user opted in by default by the policy. Valid values are:
+The IsUserOptedInByDefault parameter specifies whether users are opted in by default by the policy. Valid values are:
 
-- $true: User is Opted in by default by the policy if the user has not set a preference.
-- $false: User is Opted out by default by the policy if the user has not set a preference.
+- $true: By default, users are opted in by the policy if the user hasn't set a preference.
+- $false: By default, users are opted out by the policy if the user hasn't set a preference.
 
-An optional parameter. This parameter can be used to override the default user opt-in value set in the feature metadata. This parameter can be only be set when -IsUserControlEnabled parameter is set to $true.
+This parameter is optional and can be used to override the default user opt-in value set in the feature metadata.
+
+This parameter can be set only when the IsUserControlEnabled parameter is set to $true.
 
 ```yaml
 Type: Boolean

From 65194636c42569499b0d95c8776e9e56de05fdd0 Mon Sep 17 00:00:00 2001
From: Chris Davis <chris.davis@microsoft.com>
Date: Mon, 7 Apr 2025 11:00:40 -0700
Subject: [PATCH 20/24] Update Update-VivaModuleFeaturePolicy.md

IsUserOptedInByDefault consistency updates with Add-
---
 .../exchange-ps/exchange/Update-VivaModuleFeaturePolicy.md  | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/exchange/exchange-ps/exchange/Update-VivaModuleFeaturePolicy.md b/exchange/exchange-ps/exchange/Update-VivaModuleFeaturePolicy.md
index 12c0d9395a..8263c68884 100644
--- a/exchange/exchange-ps/exchange/Update-VivaModuleFeaturePolicy.md
+++ b/exchange/exchange-ps/exchange/Update-VivaModuleFeaturePolicy.md
@@ -275,10 +275,10 @@ Accept wildcard characters: False
 ### -IsUserOptedInByDefault
 This parameter is available in version 3.8.0-Preview2 or later of the module.
 
-The IsUserOptedInByDefault parameter specifies whether user opted in by default by the policy. Valid values are:
+The IsUserOptedInByDefault parameter specifies whether users are opted in by default by the policy. Valid values are:
 
-- $true: User is Opted in by default by the policy if the user has not set a preference.
-- $false: User is Opted out by default by the policy if the user has not set a preference.
+- $true: By default, users are opted in by the policy if the user hasn't set a preference.
+- $false: By default, users are opted out by the policy if the user hasn't set a preference.
 
 This parameter is optional and can be used to override the default user opt-in value set in the feature metadata.
 

From 26ee07076f51094e63c7e770245b919e94a41929 Mon Sep 17 00:00:00 2001
From: knovichenko <162521447+knovichenko@users.noreply.github.com>
Date: Tue, 8 Apr 2025 17:46:04 -0700
Subject: [PATCH 21/24] Update Update-VivaModuleFeaturePolicy.md

Fixed a typo.
---
 exchange/exchange-ps/exchange/Update-VivaModuleFeaturePolicy.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/exchange/exchange-ps/exchange/Update-VivaModuleFeaturePolicy.md b/exchange/exchange-ps/exchange/Update-VivaModuleFeaturePolicy.md
index 8263c68884..f8a3ee84e0 100644
--- a/exchange/exchange-ps/exchange/Update-VivaModuleFeaturePolicy.md
+++ b/exchange/exchange-ps/exchange/Update-VivaModuleFeaturePolicy.md
@@ -103,7 +103,7 @@ This example updates the name of the specified policy, makes it so the policy en
 Update-VivaModuleFeaturePolicy -ModuleId PeopleSkills -FeatureId ShowAISkills -PolicyId 3db38dfa-02a3-4039-b33a-42b0b3da029b -IsFeatureEnabled $true -IsUserControlEnabled $true -IsUserOptedInByDefault $false
 ```
 
-This example updates a policy for the ShowAISkills feature in Viva Skills. The policy enables the feature for the the users previously added to the policy, allows user controls, and opted out users by default (Soft Disable policy).
+This example updates a policy for the ShowAISkills feature in Viva Skills. The policy enables the feature for the users previously added to the policy, allows user controls, and opted out users by default (Soft Disable policy).
 
 ## PARAMETERS
 

From 00e82723709a85bee88f5b51ad937bd7840eb83b Mon Sep 17 00:00:00 2001
From: SarinaMS <sdhaliwal@microsoft.com>
Date: Tue, 22 Apr 2025 10:14:46 -0700
Subject: [PATCH 22/24] Update New-CsTeamsEventsPolicy.md

---
 .../teams-ps/teams/New-CsTeamsEventsPolicy.md | 24 +++++++++++++++++--
 1 file changed, 22 insertions(+), 2 deletions(-)

diff --git a/teams/teams-ps/teams/New-CsTeamsEventsPolicy.md b/teams/teams-ps/teams/New-CsTeamsEventsPolicy.md
index 6276f82dc8..4c12b72655 100644
--- a/teams/teams-ps/teams/New-CsTeamsEventsPolicy.md
+++ b/teams/teams-ps/teams/New-CsTeamsEventsPolicy.md
@@ -4,7 +4,7 @@ Module Name: MicrosoftTeams
 online version: https://learn.microsoft.com/powershell/module/teams/new-csteamseventspolicy
 title: New-CsTeamsEventsPolicy
 schema: 2.0.0
-ms.date: 02/26/2025
+ms.date: 04/22/2025
 ---
 
 # New-CsTeamsEventsPolicy
@@ -18,7 +18,7 @@ This cmdlet allows you to create a new TeamsEventsPolicy instance and set its pr
 New-CsTeamsEventsPolicy [-Identity] <String> [-AllowWebinars <String>] [-AllowTownhalls <String>] [-AllowEmailEditing <String>] [-Description <String>]
 [-TownhallEventAttendeeAccess <String>] [-RecordingForTownhall <String>] [-RecordingForWebinar <String>]
 [-TranscriptionForTownhall <String>] [-TranscriptionForWebinar <String>] [-AllowEventIntegrations <Boolean>] [-TownhallChatExperience <String>]
-[-UseMicrosoftECDN <String>] [-EventAccessType <String>] [-WhatIf] [-Confirm] [<CommonParameters>]
+[-UseMicrosoftECDN <String>] [-EventAccessType <String>] [-ParticipantSlideControl <String>] [-WhatIf] [-Confirm] [<CommonParameters>]
 ```
 
 ## DESCRIPTION
@@ -295,6 +295,26 @@ Accept pipeline input: False
 Accept wildcard characters: False
 ```
 
+### -ParticipantSlideControl
+This setting governs whether participants can give control of presentation slides during meetings scheduled by this user. Set the type of users you want to be able to give control and be given control of presentation slides in meetings. Users excluded from the selected group will be prohibitted from giving control, or being given control, in a meeting.
+Possible values are:
+ - **Everyone**: Anyone with the join link may enter the event.
+ - **EveryoneInOrganization**: Only internal AAD users and Multi-Tenant Organization (MTO) users can give or take control.
+ - **EveryoneInOrganizationAndGuests**: Only those who are Guests to the tenant, MTO users, and internal AAD users may enter the event.
+ - **None**: No one in the meeting can give or take control.
+
+```yaml
+Type: String
+Parameter Sets: (All)
+Aliases:
+
+Required: False
+Position: Named
+Default value: EveryoneInOrganization
+Accept pipeline input: False
+Accept wildcard characters: False
+```
+
 ### -Confirm
 The Confirm switch does not work with this cmdlet.
 

From 3fd420bd127fc4a11d1a0e77e7946874c1662827 Mon Sep 17 00:00:00 2001
From: SarinaMS <sdhaliwal@microsoft.com>
Date: Tue, 22 Apr 2025 10:18:31 -0700
Subject: [PATCH 23/24] Update Set-CsTeamsEventsPolicy.md

---
 .../teams-ps/teams/Set-CsTeamsEventsPolicy.md | 25 +++++++++++++++++--
 1 file changed, 23 insertions(+), 2 deletions(-)

diff --git a/teams/teams-ps/teams/Set-CsTeamsEventsPolicy.md b/teams/teams-ps/teams/Set-CsTeamsEventsPolicy.md
index f9eebe43b6..9d2bc56c43 100644
--- a/teams/teams-ps/teams/Set-CsTeamsEventsPolicy.md
+++ b/teams/teams-ps/teams/Set-CsTeamsEventsPolicy.md
@@ -4,7 +4,7 @@ Module Name: MicrosoftTeams
 online version: https://learn.microsoft.com/powershell/module/teams/set-csteamseventspolicy
 title: Set-CsTeamsEventsPolicy
 schema: 2.0.0
-ms.date: 02/26/2025
+ms.date: 04/22/2025
 ---
 
 # Set-CsTeamsEventsPolicy
@@ -21,7 +21,7 @@ Set-CsTeamsEventsPolicy [-AllowWebinars <String>] [-EventAccessType <String>] [-
  [-AllowedTownhallTypesForRecordingPublish <String>] [-TownhallChatExperience <String>] [-Description <String>]
  [-RecordingForTownhall <String>] [-RecordingForWebinar <String>]
  [-TranscriptionForTownhall <String>] [-TranscriptionForWebinar <String>]
- [-UseMicrosoftECDN <Boolean>]
+ [-UseMicrosoftECDN <Boolean>] [-ParticipantSlideControl <String>]
  [-Identity] <String> [-Force] [-WhatIf] [-Confirm] [<CommonParameters>]
 ```
 
@@ -388,6 +388,27 @@ Accept pipeline input: False
 Accept wildcard characters: False
 ```
 
+### -ParticipantSlideControl
+This setting governs whether participants can give control of presentation slides during meetings scheduled by this user. Set the type of users you want to be able to give control and be given control of presentation slides in meetings. Users excluded from the selected group will be prohibitted from giving control, or being given control, in a meeting.
+
+Possible values are:
+ - **Everyone**: Anyone with the join link may enter the event.
+ - **EveryoneInOrganization**: Only internal AAD users and Multi-Tenant Organization (MTO) users can give or take control.
+ - **EveryoneInOrganizationAndGuests**: Only those who are Guests to the tenant, MTO users, and internal AAD users may enter the event.
+ - **None**: No one in the meeting can give or take control.
+ - 
+```yaml
+Type: String
+Parameter Sets: (All)
+Aliases:
+
+Required: False
+Position: Named
+Default value: EveryoneInOrganization
+Accept pipeline input: False
+Accept wildcard characters: False
+```
+
 ### -Confirm
 The Confirm switch does not work with this cmdlet.
 

From 0d2e8e3c3a0f2416ba9f37e041544697adea7ee3 Mon Sep 17 00:00:00 2001
From: SarinaMS <sdhaliwal@microsoft.com>
Date: Tue, 22 Apr 2025 10:18:58 -0700
Subject: [PATCH 24/24] Update New-CsTeamsEventsPolicy.md

---
 teams/teams-ps/teams/New-CsTeamsEventsPolicy.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/teams/teams-ps/teams/New-CsTeamsEventsPolicy.md b/teams/teams-ps/teams/New-CsTeamsEventsPolicy.md
index 4c12b72655..47c5db1a1d 100644
--- a/teams/teams-ps/teams/New-CsTeamsEventsPolicy.md
+++ b/teams/teams-ps/teams/New-CsTeamsEventsPolicy.md
@@ -297,6 +297,7 @@ Accept wildcard characters: False
 
 ### -ParticipantSlideControl
 This setting governs whether participants can give control of presentation slides during meetings scheduled by this user. Set the type of users you want to be able to give control and be given control of presentation slides in meetings. Users excluded from the selected group will be prohibitted from giving control, or being given control, in a meeting.
+
 Possible values are:
  - **Everyone**: Anyone with the join link may enter the event.
  - **EveryoneInOrganization**: Only internal AAD users and Multi-Tenant Organization (MTO) users can give or take control.