Merging changes synced from https://github.com/MicrosoftDocs/powerapps-docs-pr (branch live)

Author: bishalgoswami

powerapps-docs/chatbots.md

@@ -8,7 +8,6 @@ ms.custom:
 ms.date: 06/26/2020
 ms.author: iawilt
 ms.reviewer: mvakoc
-ms.custom: pva, power-apps
 ---
 # Create chatbots from Power Apps
 

powerapps-docs/developer/common-data-service/configure-entity-relationship-cascading-behavior.md

@@ -70,6 +70,10 @@ The `CascadeConfiguration` (<xref:Microsoft.Xrm.Sdk.Metadata.CascadeConfiguratio
 > deactivated when the reassignment occurs. The new owner of the record will need to reactivate the workflow or business rule 
 > if they want to continue using it.
 
+
+> [!NOTE]
+> When performing a merge between two custom entities, DateTime values will not merge. The DateTime of the target record will remain unchanged.
+
 <a name="BKMK_ReparentAction"></a>   
 ### About the reparent action  
  The reparent action is very similar to the share action except that it deals with the inherited read access rights instead of explicit read access rights. The reparent action is when you change the value of the referencing attribute in a parental relationship. When a reparent action occurs, the desired scope of the inherited read access rights for related entities might change. The cascade actions related to the reparent action refer to changes to read access rights for the entity record and any entity records related to it.  

powerapps-docs/developer/common-data-service/optimistic-concurrency.md

@@ -31,12 +31,12 @@ On a multi-threaded and multi-user system like Power Apps, operations and data c
 
 ## Apply optimistic concurrency using Web API
 
-For information about using Web API to apply optimistic concurrency, see [Apply optimistic concurrency](webapi/perform-conditional-operations-using-web-api.md##apply-optimistic-concurrency)
+For information about using Web API to apply optimistic concurrency, see [Apply optimistic concurrency](webapi/perform-conditional-operations-using-web-api.md#apply-optimistic-concurrency)
 
 
 ## Apply optimistic concurrency using Organization service
 
-For information about using Organization service to apply optimistic concurrency, see [Optimistic concurrency behavior](org-service/entity-operations-update-delete.md##optimistic-concurrency-behavior)
+For information about using Organization service to apply optimistic concurrency, see [Optimistic concurrency behavior](org-service/entity-operations-update-delete.md#optimistic-concurrency-behavior)
 
 <a name="bkmk_handle"></a>   
 ## Handle exceptions  

powerapps-docs/maker/common-data-service/export-to-data-lake.md

@@ -85,8 +85,7 @@ Follow the steps in the [Create an Azure Storage account](/azure/storage/blobs
 Your Common Data Service environment is linked to the Azure Data Lake Storage Gen2 account. The file system in the Azure storage account is created with a folder for each entity selected to be replicated to the data lake. 
 
 > [!NOTE]
-> The data exported by Export to data lake service is encrypted at rest in Azure Data Lake Storage Gen2. Additionally, transient data in the blob storage is also encrypted at rest. Encryption in Azure Data Lake Storage Gen2 helps you protect your data, implement enterprise security policies, and meet regulatory compliance requirements. More information: [Azure Data Encryption-at-Rest]( /azure/security/fundamentals/encryption-atrest)
-
+> The data exported by Export to data lake service is encrypted at rest in Azure Data Lake Storage Gen2. Additionally, transient data in the blob storage is also encrypted at rest. Encryption in Azure Data Lake Storage Gen2 helps you protect your data, implement enterprise security policies, and meet regulatory compliance requirements. More information: [Azure Data Encryption-at-Rest]( /azure/security/fundamentals/encryption-atrest) <br />
 > Currently, you can't provide public IPs for Export to data lake service that can be used in **Azure Data Lake firewall settings**. Public IP network rules have no effect on requests originating from the same Azure region as the storage account. Services deployed in the same region as the storage account use private Azure IP addresses for communication. Thus, you can't restrict access to specific Azure services based on their public outbound IP address range. 
 More information: [Configure Azure Storage firewalls and virtual networks]( /azure/storage/common/storage-network-security)
 

powerapps-docs/maker/model-driven-apps/assign-form-order.md

@@ -31,6 +31,8 @@ search.app:
  You can't assign security roles to quick create, quick view, or card forms, so the only form that will be used by everyone is the one at the top of the form order.  
 
 ## To assign a form order  
+> [!NOTE]
+> To set form order using the new experience, see [Set the form order](control-access-forms.md#set-the-form-order).
   
 1.  Open the [solutions explorer](advanced-navigation.md#solution-explorer), expand the entity that you want, and then select **Forms**.