Merge branch 'master' into patch-1

Author: v-dihans

exchange/exchange-ps/exchange/New-AntiPhishPolicy.md

@@ -28,6 +28,7 @@ New-AntiPhishPolicy [-Name] <String>
  [-AuthenticationFailAction <SpoofAuthenticationFailAction>]
  [-Confirm]
  [-Enabled <Boolean>]
+ [-EnableFirstContactSafetyTips <Boolean>]
  [-EnableMailboxIntelligence <Boolean>]
  [-EnableMailboxIntelligenceProtection <Boolean>]
  [-EnableOrganizationDomainsProtection <Boolean>]
@@ -174,6 +175,25 @@ Accept pipeline input: False
 Accept wildcard characters: False
 ```
 
+### -EnableFirstContactSafetyTips
+The EnableFirstContactSafetyTips parameter specifies whether to enable or disable the safety tip that's shown when recipients first receive an email from a sender or do not often receive email from a sender. Valid values are:
+
+- $true: First contact safety tips are enabled.
+- $false: First contact safety tips are disabled. This is the default value.
+
+```yaml
+Type: Boolean
+Parameter Sets: (All)
+Aliases:
+Applicable: Exchange Online, Exchange Online Protection
+
+Required: False
+Position: Named
+Default value: None
+Accept pipeline input: False
+Accept wildcard characters: False
+```
+
 ### -EnableMailboxIntelligence
 This setting is part of impersonation protection and is only available in Microsoft Defender for Office 365.
 

exchange/exchange-ps/exchange/Set-AntiPhishPolicy.md

@@ -28,6 +28,7 @@ Set-AntiPhishPolicy -Identity <AntiPhishPolicyIdParameter>
  [-AuthenticationFailAction <SpoofAuthenticationFailAction>]
  [-Confirm]
  [-Enabled <Boolean>]
+ [-EnableFirstContactSafetyTips <Boolean>]
  [-EnableMailboxIntelligence <Boolean>]
  [-EnableMailboxIntelligenceProtection <Boolean>]
  [-EnableOrganizationDomainsProtection <Boolean>]
@@ -178,6 +179,25 @@ Accept pipeline input: false
 Accept wildcard characters: False
 ```
 
+### -EnableFirstContactSafetyTips
+The EnableFirstContactSafetyTips parameter specifies whether to enable or disable the safety tip that's shown when recipients first receive an email from a sender or do not often receive email from a sender. Valid values are:
+
+- $true: First contact safety tips are enabled.
+- $false: First contact safety tips are disabled. This is the default value.
+
+```yaml
+Type: Boolean
+Parameter Sets: (All)
+Aliases:
+Applicable: Exchange Online, Exchange Online Protection
+
+Required: False
+Position: Named
+Default value: None
+Accept pipeline input: False
+Accept wildcard characters: False
+```
+
 ### -EnableMailboxIntelligence
 This setting is part of impersonation protection and is only available in Microsoft Defender for Office 365.
 

exchange/exchange-ps/exchange/Start-ManagedFolderAssistant.md

@@ -118,6 +118,8 @@ The Identity parameter specifies the mailbox to be processed. In cross-premises
 - SamAccountName
 - User ID or user principal name (UPN)
 
+**Note**: In the cloud-based service, if you receive an error, try using the mailbox GUID for the value of this parameter. You can get the mailbox GUID value by replacing <UserIdentity> with the email address of the user and running the following command: `Get-Mailbox -User <UserIdentity> | Format-List *GUID,MailboxLocations`.
+
 ```yaml
 Type: MailboxOrMailUserIdParameter
 Parameter Sets: (All)